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-arcade
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
137 files changed, 2066 insertions, 931 deletions
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 92a5a86fffa2..4c86c13061dc 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/aop/Manifest b/games-arcade/aop/Manifest
index 3a273d19b550..9353ee1295bb 100644
--- a/games-arcade/aop/Manifest
+++ b/games-arcade/aop/Manifest
@@ -1,4 +1,4 @@
-AUX aop-0.6-as-needed.patch 207 BLAKE2B f2baabf390d7376b55a815c256d0c63194a16d822abfbbc7103cd08463e6b193d443c0404cd691085f8a8a849cc14de98c642ff177ce7b6dae5d0e250bc264fc SHA512 4da201cc444e943f21287208944dae0fa981697af97618268ff94699f1ec52c8fcabcbe2b609f3ab36f4c19fdfdf4c76f7acbcfebe6978bb2740ba02a6c8ecc7
+AUX aop-0.6-as-needed.patch 134 BLAKE2B 1a77418c6750ee0f69e7e79bb03c2a7cbf55a998258f33cb0c6e78aa6f676db9196fc6241369ab3074a3c9c1acce1be10459f9d62f3adca1cc38261935c7c8e7 SHA512 45073f16932019d06bd7407de1c2ecc7282071b049172f2dfea5c3dba1b5ea48cdbc4d602911af81405f1b591cab86cde5b9b833f4553d57e437b7b05e245eb6
 DIST aop-0.6.tar.gz 11811 BLAKE2B 9b8a278ac4afb33dc9bb79d92343f9cf0fb4968aae04898700c948d01788cf33523989583ef39661142e0078e31488b24f8bf1a6bd9586e00afc4f7248fc8ca1 SHA512 0ce37647a0832b17e23df409633952f902e02666fa536cc4393a35bf91b245a501feeb4f14fd16d1a1d5c4f39682dad18a8e671e107e96cf5ba9c89965f8a77c
-EBUILD aop-0.6-r2.ebuild 670 BLAKE2B 75ba25bbcbba898505ed9529d665129719c569f51677268d937f3862e3b039934d2c7582c8a6afe0c9dd4e1e67fc02a0358ff5f05e1ed69a1d18b4f8840245e7 SHA512 6b5044f4ea693481933b972b9a3700e9ee0f27aa3474b0ce7e0eeacb8961a4bbd2fda573f72307b411c5a72a248741560298f94a381f9caf212eff6c8c7f6b45
+EBUILD aop-0.6-r2.ebuild 719 BLAKE2B 25af87066c0307c7c8ab328ad618af12e71e67dd6b2112c3fc445b09a74e8d29df0e58705c6bd6233ff81d1b8aa5f01ea2ad3882cf170669b0e732cc8f31a124 SHA512 ffcfa035ba0b7d4bc7c553d2a92f7873eec3b1296e6f9d9a969dfd56c52b12722b080bc8909b403370e22ce31b2a87d5d5ce24dbd774a3040295038f10a3c373
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aop/aop-0.6-r2.ebuild b/games-arcade/aop/aop-0.6-r2.ebuild
index d0849e3b9401..2f52e08067cd 100644
--- a/games-arcade/aop/aop-0.6-r2.ebuild
+++ b/games-arcade/aop/aop-0.6-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Ambassador of Pain is a curses based game with only 64 lines of code"
 HOMEPAGE="http://raffi.at/view/code/aop"
 SRC_URI="http://www.raffi.at/code/${PN}/${P}.tar.gz"
@@ -22,6 +24,8 @@ PATCHES=(
 src_prepare() {
 	default
 
+	tc-export CC PKG_CONFIG
+
 	sed -i \
 		-e "s#/usr/local/share#/usr/share/${PN}#" \
 		aop.c || die
@@ -30,7 +34,7 @@ src_prepare() {
 src_install() {
 	dobin aop
 
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/${PN}
 	doins aop-level-*.txt
 
 	einstalldocs
diff --git a/games-arcade/aop/files/aop-0.6-as-needed.patch b/games-arcade/aop/files/aop-0.6-as-needed.patch
index f172919553b4..85934f30b062 100644
--- a/games-arcade/aop/files/aop-0.6-as-needed.patch
+++ b/games-arcade/aop/files/aop-0.6-as-needed.patch
@@ -1,9 +1,9 @@
---- a/Makefile.old	2009-01-30 17:00:58.000000000 +0100
-+++ b/Makefile	2009-01-30 17:01:15.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,5 @@
  
 -LDFLAGS = -lncurses
-+LDLIBS := $(shell pkg-config ncurses --libs)
++LDLIBS := $(shell ${PKG_CONFIG} ncurses --libs)
  
  aop: aop.c
  
diff --git a/games-arcade/aquaria/Manifest b/games-arcade/aquaria/Manifest
index e02ab4e0ea44..af6052ab7666 100644
--- a/games-arcade/aquaria/Manifest
+++ b/games-arcade/aquaria/Manifest
@@ -1,3 +1,3 @@
 DIST aquaria-lnx-humble-bundle.mojo.run 209499691 BLAKE2B e592e451f192136b419281b2e55244d9baaae39bf462cd30a1bc4ad26a5ca825634309423ef3e51ae18f35023169417b1d7d78a19a3f4abf9415072d947586dd SHA512 4ae491ade644df73f676c7bd7c36aa79140aa7c4a312ecd613ba1c900506123ae37c644200433c0045713bb8f3f88e90e58be64d2fea6eee4e7015cd3e157738
-EBUILD aquaria-1.1.3-r1.ebuild 1109 BLAKE2B 8dafb8647ad0acb76cbbb1f8b598305f8806d34fac35dd4212a408fa80cc436da033af511627d2f354901bf80e2df83cc5a932956b87220730b85670470cf091 SHA512 2c005d473096f7e2364bd33f160aadc14cfba1599f626891f6810472cc724fa77206280be6c09139493635f793b816a0be877cb085850ae309ebdff7d9388f36
+EBUILD aquaria-1.1.3-r2.ebuild 1068 BLAKE2B ce66606a8e5428d530430ba15e7b2ab60d0a19b818a2ac7f8ebe5d66836bb5e11458191c8b74812744fba35164887a454b3f9e296d38e9a9cf05498fa7371de2 SHA512 6092195177c6577c8d0492e9b532590cde927b8c06d9d61487993d28a5e9cc0a68bbf68b7ba065ac0c291ff25f11d8cb9d5909bc0343b0b61433af1a3ce30b1e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
index ff45a40ffdba..e1fb8b150c63 100644
--- a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
+++ b/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils games
+EAPI=7
+
+inherit desktop unpacker wrapper
 
 DESCRIPTION="A 2D scroller set in a massive ocean world"
 HOMEPAGE="http://www.bit-blot.com/aquaria/"
 SRC_URI="aquaria-lnx-humble-bundle.mojo.run"
+S="${WORKDIR}"/data
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="strip fetch bindist"
 
-DEPEND="app-arch/unzip"
 RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
 	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
-
-dir=${GAMES_PREFIX_OPT}/${PN}
+dir=opt/${PN}
 QA_PREBUILT="${dir#/}/aquaria"
 
 pkg_nofetch() {
@@ -36,19 +35,17 @@ src_unpack() {
 }
 
 src_install() {
-	insinto "${dir}"
-	exeinto "${dir}"
+	insinto ${dir}
+	exeinto ${dir}
 
 	doins -r *.xml */
-	doexe "${PN}"
-	doicon "${PN}.png"
+	doexe ${PN}
+	doicon ${PN}.png
 
 	dodoc README-linux.txt
 	mv "${ED}/${dir}"/docs "${ED}/usr/share/doc/${PF}/html" || die
-	dosym /usr/share/doc/${PF}/html "${dir}"/docs
+	dosym  ../../../usr/share/doc/${PF}/html ${dir}/docs
 
-	games_make_wrapper "${PN}" "./${PN}" "${dir}"
+	make_wrapper "${PN}" "./${PN}" "${dir}"
 	make_desktop_entry "${PN}" "Aquaria"
-
-	prepgamesdirs
 }
diff --git a/games-arcade/ascii-invaders/Manifest b/games-arcade/ascii-invaders/Manifest
index 2e7444821c15..c3cbeda26195 100644
--- a/games-arcade/ascii-invaders/Manifest
+++ b/games-arcade/ascii-invaders/Manifest
@@ -1,3 +1,3 @@
 DIST invaders0.1b.tgz 14597 BLAKE2B ecccca6636c4d8dffbc57b8cec82471efc2fd1a256648b9ac46fd256ef99d884205f1c86ff2bf0aedb7bb5996a59a7af3f301339944c6a4753355a8a4db23190 SHA512 3ac9dee0c532384e2849fdc8910bce885e3fdef362b629e8637df1cc0d82eba52c02a836a4925d811b339e9232f20caa7c761dbc1feeddc74e9b6f09e97046b8
-EBUILD ascii-invaders-0.1b-r1.ebuild 648 BLAKE2B bfb74c132a47ad2a658fe23d590ee49ac5e566a4c9de7dc097072fe84cc6ada305648955863bb7fa74e357db12b13ad99d33043f551bffc9f9b970aac67b1976 SHA512 61d11371ea8600da54234081ecb2364e3ca9c55cfb2712e225d30d07edbf6c3e51eb5dc05563e336bfa32b0aa7a0f6fd355f9293b3dd44ff00b6dada4cbb6354
+EBUILD ascii-invaders-0.1b-r1.ebuild 679 BLAKE2B b4c34931e18eb8f44532f43724e3ddeaa4555cce72d9ddf95fd06d25f8ab71823d6143b2659ab89f8ceebfd2d3999f550833c43b252485445b5a5c783c18762f SHA512 c9cdd55597e6bd2fb0277171f1736aca24bae0b0e2bba5247d16e9adafc4ef26df383c0d3a21ee7058cafce02c7c61ee861af093bed0e306d42991792c513b48
 MISC metadata.xml 480 BLAKE2B 519e21066bfdbcb2dfa258e4c7533f217c5aa97ded13d3cb6afc0db83995ad99ffe709410f224cb9e88d19394cc8ec693993d600cb33986fb57428a0a36cfb08 SHA512 fcaa81ee096f7b5e478d8e0e21c81d3dc23e1d50c4a760515a6ab0bacf8e87adec52582726aebe4b288896c1e2403b9050d510fa3a989596d6f37e2d4df63d64
diff --git a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild b/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild
index 9437783b42ad..65c9b267ca12 100644
--- a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild
+++ b/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Space invaders clone, using ncurses library"
 HOMEPAGE="https://packages.gentoo.org/package/games-arcade/ascii-invaders"
 SRC_URI="mirror://gentoo/invaders${PV}.tgz"
@@ -24,7 +26,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake LDLIBS="$(pkg-config ncurses --libs)" invaders
+	emake LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" invaders
 }
 
 src_install() {
diff --git a/games-arcade/barbarian-bin/Manifest b/games-arcade/barbarian-bin/Manifest
index e8b6478ba6fb..e3ea2902ca8e 100644
--- a/games-arcade/barbarian-bin/Manifest
+++ b/games-arcade/barbarian-bin/Manifest
@@ -1,3 +1,3 @@
 DIST barbarian101_linux.zip 925199 BLAKE2B d8552b7fb03836ec75943b5b754489c345c70c9534301f16a64cdd21ea262fcff19ae6916bcd469b26dd088676079df2190bda369ca085d6c4285d84ebc12616 SHA512 9b46c75666359ed5102a89d29e8b6afacf07ccfa6175f6df27b5acc48b0e0119106f1c1376b124ff761d373bf04145e804659b81503b2834ba09ac05fad5c4f4
-EBUILD barbarian-bin-1.01-r1.ebuild 1242 BLAKE2B 41a093a2be3ede578059fedaf70cc979efc8fc55d4b3c4c9cf93c1134d27916411b405167ca633251da04b5d2097f7dc643a7acb5e9a1fa70cec2c1742e866ad SHA512 97e5d5d20421f666ccd9aa9bf162a649fe2b04202fe0559e6d41052c1eae993d452f78060ee99638fe647cf7cb6a230e96b79a95a2e84dec4259d9967880b8b7
+EBUILD barbarian-bin-1.01-r2.ebuild 1315 BLAKE2B 335419fd3f6b4eded4d986a4e55a7e110741ff6988d3838e213543dc29c5cf3addcc4fa6a3924728c12af8310da2efb75c0c46969db4ee94c6887163cf40689d SHA512 571996903576cd1edab8cb5adf22a96dbaeec739344d3a45166d8fea0d2d5f623a4bc6a9d6e9ae563a81e1412826e0734f399fe43adff7d6e4cae3b7755c2b7f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
deleted file mode 100644
index 555f99dd3acb..000000000000
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_PN=${PN/-bin/}
-DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
-HOMEPAGE="http://www.tdbsoft.com/"
-SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
-
-LICENSE="CC-BY-NC-ND-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
-
-game_dest="${GAMES_PREFIX_OPT}/${MY_PN}"
-QA_PREBUILT="${game_dest:1}/Barbarian"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "${game_dest}"
-	cp -r gfx sounds "${D}${game_dest}/" || die
-
-	exeinto "${game_dest}"
-	doexe Barbarian
-
-	dohtml Barbarian.html
-
-	games_make_wrapper barbarian ./Barbarian "${game_dest}"
-
-	# High-score file
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/heroes.hoh"
-	fperms 660 "${GAMES_STATEDIR}/heroes.hoh"
-	dosym "${GAMES_STATEDIR}/heroes.hoh" "${game_dest}/heroes.hoh"
-	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
-	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
-	prepgamesdirs
-}
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
new file mode 100644
index 000000000000..c7f7f26b27fe
--- /dev/null
+++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+MY_PN=${PN/-bin/}
+DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
+HOMEPAGE="http://www.tdbsoft.com/"
+SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-NC-ND-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="
+	acct-group/gamestat
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	sys-libs/libstdc++-v3:5
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+BDEPEND="app-arch/unzip"
+
+game_dest="opt/${MY_PN}"
+QA_PREBUILT="${game_dest}/Barbarian"
+
+src_install() {
+	dodir ${game_dest}
+	cp -r gfx sounds "${ED}"/${game_dest}/ || die
+
+	exeinto ${game_dest}
+	doexe Barbarian
+
+	docinto html
+	dodoc Barbarian.html
+
+	make_wrapper barbarian ./Barbarian "${game_dest}"
+
+	# High-score file
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/heroes.hoh || die
+	dosym ../../var/games/${PN}/heroes.hoh ${game_dest}/heroes.hoh
+
+	fperms 660 /var/games/${PN}/heroes.hoh
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /opt/${MY_PN}/Barbarian
+
+	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
+	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
+}
diff --git a/games-arcade/batrachians/Manifest b/games-arcade/batrachians/Manifest
index 592656fd5d9c..673eb7069092 100644
--- a/games-arcade/batrachians/Manifest
+++ b/games-arcade/batrachians/Manifest
@@ -1,4 +1,4 @@
 AUX batrachians-0.1.6-makefile.patch 1083 BLAKE2B 9660401bf833700f353a1ab8ee065d94c585c2ee8ad3ac04318f7d81a17a367c0f81e540fa4e442b75c368d79bb49758795e51507a98f4cb06a087d019d3608b SHA512 9fb3d84f864b7cad0ace0e288969871824cae110f879ba8fe512969c7b1aef370c375bde57caedf5bf2bc7e5f00a9f2819fdc7de6d710c989bb474382a84e77a
 DIST batrachians-0.1.6.tar.gz 198088 BLAKE2B 446e2fd77068dc8c58e801fca6544ea825529240a79e1b14fac6962d26d78f6f4e977f6965751ba5d09ea790679dfa820e5cdb1ed667bd0af46f8c89180a38bf SHA512 d3022712627061f9828e1f3baa7207053884f1f4c0348768d4ac073673ff1bcf14c95cedf01031b8bd36a6b684bf239af0f381df41aa18d49218320a8bea3b68
-EBUILD batrachians-0.1.6-r1.ebuild 603 BLAKE2B c44aa1b7e408b4cc98102c6632e9f012c10df08abee89f7f2c9d168b9ada73c33c0c19750afb1046f46c3226d57ae56e6048564ae5b7769a7cde7a59585bd34d SHA512 c402bb055ff07feb39fd14aa3f88953b1189555f7a1dc22a2db804b4da4464f8ca8bfa1a4e6112e38e9d69dfcc59f59af899202c21b1ce3774b7afc4ef5d3b48
+EBUILD batrachians-0.1.6-r1.ebuild 659 BLAKE2B e87b703a9b2af333c79f77530cb84ce15e39cc2d1a9ed304c0f3750cb06dc46aea8744cf14a68cd81d1b32b0933061b0d0b70ef30f4ce125cae7b87c7a66a8ec SHA512 a75ec6d41cd8881ccfb3f894681d00ea1a7c35930404905b818e20e1eea9af745197018067c66f7b6f5c58c008a7ce8b017087bc4055ff18b2ed1d62c749fcc9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild b/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
index c3da891efd81..3f26d0405bfe 100644
--- a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
+++ b/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_EAUTORECONF="yes"
+EAPI=7
 
-inherit autotools gnome2
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
 
 DESCRIPTION="A fly-eating frog video game"
 HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
@@ -13,12 +13,15 @@ SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-games/flatzebra-0.1.5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+RDEPEND="
+	>=dev-games/flatzebra-0.1.5
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index 4829f249da2f..8c1081673b4e 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -1,5 +1,6 @@
+AUX berusky-1.7.1-r2-gentoo.patch 1162 BLAKE2B 86c6baa7ea3355e1681c044ed167a378d6ae07b1cfd5b5740fc3ebb829bd721777ab52afd11b7f5d19e21f5ae48915763b711354e423d286e0ed0a6e2f665a24 SHA512 a5ce4b43a82892ba0a131ab02a5b04356930c6898e85e71841e64cd874fec82dcff7f337bf393f9a9a0274c233701b1988b117e0e8b339d9439a0434b6d7d12e
 DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
 DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
 DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r1.ebuild 745 BLAKE2B 53ac8329a31131a346d61477548a02e411a3dce90da4a83652cb6b6ea2e4b018671e6856f48dbea5964e477db5646fd4aee7f2be099dcf8fd0972522ccf86a81 SHA512 a19aa6b233b50c16fc849b283758b1fed95d4f27b61b91cdee801f3427155e69aed4dd858b91b054fa41aed156c538e6ae80741a2eda208eb75fc1ccf69aea19
+EBUILD berusky-1.7.1-r2.ebuild 1013 BLAKE2B 7e5e131aef673f489d2320c14fdd3c6f3eb4bf5ec375ab09d52eabc509f2b7a1d5d136b6c301535db16362ffaeed6a8cd7df60c8d4b9acca22d3d9a7fd4404db SHA512 096423bc6de331213caea01bb58ebb4aff7cf1de69a05f2979b784c3d4b283514d143acf1af5cb9556d33c508c3f1a63aa2785026e80efc8521fa3b42c847846
 MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
index 57077ecfc396..66d347e826c9 100644
--- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r2.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 gnome2
 
 DATAFILE="${PN}-data-1.7"
@@ -14,20 +15,36 @@ SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl[X,video]
 	media-libs/sdl-image[png]
 	x11-libs/gtk+:2
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-r1-gentoo.patch
+)
+
+src_prepare() {
+	mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die
+
+	default
+}
 
 src_install() {
 	gnome2_src_install
-	rm -rf "${ED}"/usr/doc
+
+	rm -rf "${ED}"/usr/doc || die
+
+	insinto /usr/share/${PN}
+	doins -r GameData Graphics Levels
+
+	insinto /var/lib/${PN}
+	doins berusky.ini
+
 	doicon -s 32 "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN}
 }
diff --git a/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
new file mode 100644
index 000000000000..6fd1381ad2ac
--- /dev/null
+++ b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,8 +5,7 @@
+ 
+ SUBDIRS = po src data
+ 
+-beruskydocdir = ${prefix}/doc/berusky
+-beruskydoc_DATA = \
++EXTRA_DIST = \
+ 	README\
+ 	COPYING\
+ 	AUTHORS\
+@@ -15,10 +14,6 @@
+ 	NEWS\
+ 	TODO
+ 
+-EXTRA_DIST = $(beruskydoc_DATA)
+-
+-
+-
+ # Copy all the spec files. Of cource, only one is actually used.
+ dist-hook:
+ 	for specfile in *.spec; do \
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -3,10 +3,3 @@
+ ## Created by Anjuta - will be overwritten
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+-
+-berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@
+-
+-berusky_data_DATA = \
+-	berusky.ini
+-
+-EXTRA_DIST = $(berusky_data_DATA)
+--- a/src/defines.h
++++ b/src/defines.h
+@@ -446,7 +446,7 @@
+ #define INI_USER_DIRECTORY "~/.berusky"
+ #define INI_USER_LEVELS    "~/.berusky/User"
+ #define INI_USER_PROFILES  "~/.berusky/Profiles"
+-#define INI_FILE_GLOBAL    "/var/games/berusky/"INI_FILE_NAME
++#define INI_FILE_GLOBAL    "/var/lib/berusky/"INI_FILE_NAME
+ #define INI_FILE_USER      "~/.berusky/"INI_FILE_NAME
+ #define INI_FILE_LOCAL     "./"INI_FILE_NAME
+ #elif WINDOWS
diff --git a/games-arcade/betna/Manifest b/games-arcade/betna/Manifest
index 6f654b51dc2b..3e12d66075b9 100644
--- a/games-arcade/betna/Manifest
+++ b/games-arcade/betna/Manifest
@@ -1,3 +1,3 @@
 DIST betna-0.9.7.tgz 684723 BLAKE2B 1bef53f216faea681bb4e5dd64ef4eba8ce52f62acf5c1ab8af4890cc97f4d3c529cb3e33633b906990e628cc63c7282367fd31c473954a9c258ff1c4fd43286 SHA512 01a979b3bd5adf1581293db8a066a4db1b4818f5986d8954d0da5d1e1eb394201c2affcee8c679b7cd23b4d255f718619dc00183b59fe7be280f18db0c0548d5
-EBUILD betna-0.9.7.ebuild 994 BLAKE2B 9065b0effe4d4f9638832a84798528b114be56cb4cb0c9c62fc50fe1462ad030a2910bcc4406ee226278573dbd1d313083c174d387bb5cf5a179fa022aa94ef6 SHA512 60af7a4b7b1e2cf532a795fc7fd0f1517c3640ea2690983ebeaede592863ce47178f3a58403e85e06b43d32482e635b0f27d7b709fc0b62862ce6099248733ee
+EBUILD betna-0.9.7-r1.ebuild 1006 BLAKE2B 4e89d2bfbee76a6c1c86ccc37c6b18fe26b0b205c5064efa74e760623fd55b54a41dd6a171fcfddf4754386f891274f279cb41cde6cdb71f720187dc4b650be2 SHA512 ba9b0ed8ae5732d50fb1d02855c51e83f6d621c358b8f3f9fb43728c28bca7613bb1a4a4c7d177e57dc3ad033026db44308a83d8f2dac9851c4a93aae978f77d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/betna/betna-0.9.7.ebuild b/games-arcade/betna/betna-0.9.7-r1.ebuild
index 57c0d775c4da..0aaf65902004 100644
--- a/games-arcade/betna/betna-0.9.7.ebuild
+++ b/games-arcade/betna/betna-0.9.7-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Defend your volcano from the attacking ants by firing rocks/bullets at them"
 HOMEPAGE="http://koti.mbnet.fi/makegho/c/betna/"
@@ -11,15 +12,16 @@ SRC_URI="http://koti.mbnet.fi/makegho/c/betna/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e '/blobprintf.*char msg/s/char msg/const char msg/' \
-		-e "s:images/:${GAMES_DATADIR}/${PN}/:" \
+		-e "s:images/:/var/lib/${PN}/:" \
 		src/main.cpp || die
 
 	sed -i \
@@ -30,17 +32,23 @@ src_prepare() {
 		Makefile || die
 }
 
+src_configure() {
+	tc-export CXX
+}
+
 src_compile() {
 	emake clean
 	emake
 }
 
 src_install() {
-	dogamesbin betna
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin betna
+	dodoc README Q\&A
+
+	insinto /var/lib/${PN}
 	doins images/*
+
 	newicon images/target.bmp ${PN}.bmp
+
 	make_desktop_entry ${PN} Betna /usr/share/pixmaps/${PN}.bmp
-	dodoc README Q\&A
-	prepgamesdirs
 }
diff --git a/games-arcade/blockrage/Manifest b/games-arcade/blockrage/Manifest
index 293f2aa66814..1357ed688e6f 100644
--- a/games-arcade/blockrage/Manifest
+++ b/games-arcade/blockrage/Manifest
@@ -1,4 +1,5 @@
-AUX blockrage-0.2.3-config.patch 949 BLAKE2B c45af2acebc7e4c1f0bed710cec317f88e7a40fdcba1420f4349c1bf20aec95bc1f72b8d95411129bb05c51ffae373e87449ca974bca922b906915ac3bc0e4d1 SHA512 41b9446bbd0f1a5f0c9c740a3208ed01ec0f6b80bbce0c68e4e24b05b6e5c3bd22a308bc2ef72969dab95faffe20a9456a07e62e110378b4ad2034f9f7676f16
+AUX blockrage-0.2.3-config.patch 957 BLAKE2B f4a15ec3d7387c1e97c087c809ab441d062c1841f2dd785b57e98aa050dcb19248c83448184051a599af507c81d70c38d1423b91e3fc50cde143aadcce8dbdc3 SHA512 1e0abaf36ccdf531e75cbd6c4aea40bf5b2983270a64737db8ea63f0dd4dca283366271dd9d45e0231e1094088cd7a39d22f539ed402335ca4b3dcf7606739c2
+AUX blockrage-0.2.3-statx.patch 3402 BLAKE2B 88241189ac6728e3db5888e6623faea0210cccbe53352219dc90ea912339a5e308912246c2e9ed47e69258a46d6f66c1d70ed63afb65d678089b4dec12ab6933 SHA512 8a78c8152c5b805ea61f2675041072ac50f036978876e380ba19e7a62654c9d71a5ff8ccb18a7723cb509eb462f0fe0d0c44f8829929864241edc62f88a71ce5
 DIST blockrage-0.2.3.tar.gz 75620 BLAKE2B f54e0f2e30e36b9c9692c28a4cb894305cb9e0eaae31873073899aeafaa1a032c56533840c5094ff60e3e9eb09587fc9cc83b8469f39952ce483369243f5fcc1 SHA512 20ad63cb75f6f3afe482b54c5dc0487615ed9ac9a43fa3819b1da43f343c8dde6c3eb817b46b586bbfdca6ad9c9e9cb3c220f5ab536397e407250daf9fd61aa2
-EBUILD blockrage-0.2.3.ebuild 618 BLAKE2B 805c5fc2794b9f6d6534422f8978425341ea8c250ce6b44779e091de79790bbec6629a10b2380c097f1356579318e02c1351610a4caca8123e28c85ea961ed42 SHA512 66e66aea0193e31aaa72eaf85d647370057c657960370a2181330349a69eec1e83c37a4737b0d9fccf85d8f442c2d44ce97b0a93a1f6d5ba0feb6163c2fd2b6e
+EBUILD blockrage-0.2.3-r1.ebuild 634 BLAKE2B dedf2fd103aa43a92628c64aea7e9dd7c4648d572d4de0d20e222382db448d220bff908a8a39c3f20f70c5c4e9589e1b90aa4bf80a3f9052953b75f4bc126604 SHA512 a45dd69c37716b6b0f32c199cb143653c6b838760e7d6efa4c405706803618018fde78640be8f3860b870418f6ced5485cba218e55106042d4edc3637551174b
 MISC metadata.xml 332 BLAKE2B d8f4b60da9720f0cb44633c89a5c7b50f360391b4970766eab87518b669864266718a21c5ef835c122b5c088e1b747f3ce0bff7f4aa06a84528c4f2d52691dfe SHA512 f0109e967113083a663e0128ab444ca44860eef79d3bf3f2950ee27ae5c3eceb0b11ad8cc3a5dd5cd1883623a87978473f2d20387aa8f61c22c11b1b77344b32
diff --git a/games-arcade/blockrage/blockrage-0.2.3.ebuild b/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild
index 62aa1d3692a6..5e57e04ca851 100644
--- a/games-arcade/blockrage/blockrage-0.2.3.ebuild
+++ b/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Falling-blocks arcade game with a 2-player hotseat mode"
 HOMEPAGE="http://blockrage.sourceforge.net/"
@@ -11,19 +12,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-# Removing error due to wrong detection of cross-compile mode
 DOCS=( ChangeLog KNOWN_BUGS README TODO )
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-config.patch
-}
+PATCHES=(
+	# Removing error due to wrong detection of cross-compile mode
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-statx.patch
+)
 
-src_install() {
+src_configure() {
+	tc-export CC
 	default
-	prepgamesdirs
 }
diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch
index dc1875fc28e8..f1b3e5bde119 100644
--- a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch
+++ b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch
@@ -1,5 +1,5 @@
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -40,7 +40,7 @@
  SOUND_OPT=
  
@@ -17,8 +17,8 @@
        fi;;
      
      --bindir=*) bindir="$cfg_optarg";;
---- src/Makefile.in
-+++ src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -1,7 +1,7 @@
  OBJS    = main.o gfxout.o gfxlib.o menus.o keyboard.o bg.o sound.o global.o timer.o
  
diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch b/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch
new file mode 100644
index 000000000000..95459e0984e6
--- /dev/null
+++ b/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch
@@ -0,0 +1,92 @@
+Thanks-to: samuel.bauer
+https://bugs.gentoo.org/669598
+--- a/src/main.c
++++ b/src/main.c
+@@ -102,7 +102,7 @@
+ 
+ int immedstart;
+ int quit;
+-static int statx[6],staty[6];
++static int stat_x[6],stat_y[6];
+ int diffx,diffy;   /* coordinates of the difficulty level display box */
+ int ts_x0,ts_x1;   /* x-coordinates of the top-ten names(ts_x0) & scores(ts_x1) */
+ int no_of_sets;
+@@ -191,14 +191,14 @@
+ 
+ static void game_drawscore(player_t *p, int bgvcpy) {
+   if(bgvcpy) {
+-    v_drawscrarea(bmp_game[players-1].data,statx[1],staty[1],
++    v_drawscrarea(bmp_game[players-1].data,stat_x[1],stat_y[1],
+                 strpixlen("0000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
+   }
+   t_align=T_LEFT;
+-  v_printf(statx[1],staty[1],FONT_HIGHLIGHTED,"%07d",p->score);
++  v_printf(stat_x[1],stat_y[1],FONT_HIGHLIGHTED,"%07d",p->score);
+   
+   if(bgvcpy) {
+-    virt_cpyarea(statx[1],staty[1],
++    virt_cpyarea(stat_x[1],stat_y[1],
+                strpixlen("00000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
+   }
+ }
+@@ -206,28 +206,28 @@
+ static void game_drawlevelnum(int bgvcpy) {
+ 
+   if(bgvcpy) {
+-    v_drawscrarea(bmp_game[players-1].data,statx[3],staty[3],
++    v_drawscrarea(bmp_game[players-1].data,stat_x[3],stat_y[3],
+                 strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
+   }
+   t_align=T_LEFT;
+-  v_printf(statx[3],staty[3],FONT_HIGHLIGHTED,"%02d",level);
++  v_printf(stat_x[3],stat_y[3],FONT_HIGHLIGHTED,"%02d",level);
+   
+   if(bgvcpy) {
+-    virt_cpyarea(statx[3],staty[3],
++    virt_cpyarea(stat_x[3],stat_y[3],
+                strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
+   }
+ }
+ 
+ static void game_drawblocksleft(int bgvcpy) {
+   if(bgvcpy) {
+-    v_drawscrarea(bmp_game[players-1].data,statx[5],staty[5],
++    v_drawscrarea(bmp_game[players-1].data,stat_x[5],stat_y[5],
+                 strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
+   }
+   t_align=T_LEFT;
+-  v_printf(statx[5],staty[5],FONT_HIGHLIGHTED,"%02d",blocksleft);
++  v_printf(stat_x[5],stat_y[5],FONT_HIGHLIGHTED,"%02d",blocksleft);
+   
+   if(bgvcpy) {
+-    virt_cpyarea(statx[5],staty[5],
++    virt_cpyarea(stat_x[5],stat_y[5],
+                strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
+   }
+ }
+@@ -371,9 +371,9 @@
+ void game_statistics_draw(void) {
+   if(players==1) {
+     t_align=T_LEFT;
+-    v_print(statx[0],staty[0],FONT_NORMAL,"Score:");
+-    v_print(statx[2],staty[2],FONT_NORMAL,"Level:");
+-    v_print(statx[4],staty[4],FONT_NORMAL,"Blocks:");
++    v_print(stat_x[0],stat_y[0],FONT_NORMAL,"Score:");
++    v_print(stat_x[2],stat_y[2],FONT_NORMAL,"Level:");
++    v_print(stat_x[4],stat_y[4],FONT_NORMAL,"Blocks:");
+     game_drawlevelnum(0);
+     game_drawblocksleft(0);
+     game_drawscore(&(player[0]),0);
+@@ -1530,9 +1530,9 @@
+   fscanf(f,"%d %d %d %d %d %d",&nx_x0[0],&nx_y0[0],
+   &nx_x0[1],&nx_y0[1],&nx_x0[2],&nx_y0[2]);
+   
+-  fscanf(f,"%d %d %d %d",&statx[0],&staty[0],&statx[1],&staty[1]);
+-  fscanf(f,"%d %d %d %d",&statx[2],&staty[2],&statx[3],&staty[3]);
+-  fscanf(f,"%d %d %d %d",&statx[4],&staty[4],&statx[5],&staty[5]);
++  fscanf(f,"%d %d %d %d",&stat_x[0],&stat_y[0],&stat_x[1],&stat_y[1]);
++  fscanf(f,"%d %d %d %d",&stat_x[2],&stat_y[2],&stat_x[3],&stat_y[3]);
++  fscanf(f,"%d %d %d %d",&stat_x[4],&stat_y[4],&stat_x[5],&stat_y[5]);
+   
+   fscanf(f,"%d %d",&diffx,&diffy);
+   fscanf(f,"%d %d",&ts_x0,&ts_x1);
diff --git a/games-arcade/bomns/Manifest b/games-arcade/bomns/Manifest
index b8f60839a00e..c2dd4551eea1 100644
--- a/games-arcade/bomns/Manifest
+++ b/games-arcade/bomns/Manifest
@@ -1,4 +1,4 @@
-AUX bomns-0.99.2-fpe.patch 350 BLAKE2B c80f7e73861a458c31df12db2cae3a6776b1d2b512a30927e76ed6277523173e8fbc03bb24a851db428b58910c331cc084ca063bac86ccef23f3e41c6bd3a4a6 SHA512 0e8aad5ebcfc536051c59b7d44c125a82d98ee8963df4fbc2cb0edf879be2e6898b7938aa26cd8f535355e4c2dfa7f95f232b506850fd5a6105ef84f5a37c092
+AUX bomns-0.99.2-fpe.patch 278 BLAKE2B 6fe7caf77953d198bc7013ab4302820ad43728e42470ccf419eeffc2fc4aec9b8a5866100a0afe12b7ff38425ef220ba9dce14754b8e65dcedff314f2eb913f8 SHA512 e2942dd3842cae18c3c5e674dbbdbf733d080b48f427fc5f16a2aa2bb2d001210b9dfcc7930246840b23c79513aa0adca44eda378a9b1bf8bed6109ec73be84d
 DIST bomns-0.99.2.tar.gz 1079850 BLAKE2B 7d7eb5a55455fc300d265b5efa652310d0e08b1c4a688221ca0ad8d578b423efac1bd00cd637f1918d1ba9fe903c5890e63c1ce3dab80e9e8f312083be824898 SHA512 db4a2352af0cb220dc0c12de8796d17bbfb71e1aa7de1743dfe534fe4f54c38217f893f0fcaef1dc97509198eec7446d352e92077644664d4bf48acbc2a7897f
-EBUILD bomns-0.99.2.ebuild 1038 BLAKE2B 43d31f390872cb3ada4ac9ba064ae78351ed2cba7d3ae1f3f0b733f3b5e784fd33eca0c490596d2363361703369bc16c5699bdfaed218d0a3ea34412f4dc339f SHA512 74b0735fce85ccc4bd7deba578a51ad074d5bf4465db4b7bc8bbc1c78954d135e20dd8b1e2495d16ec3f28712c8b29e38e49bc3fd16b659638485b7bb0046c51
+EBUILD bomns-0.99.2-r1.ebuild 1028 BLAKE2B a9c855758c6c92cb13fcaa1082636b82c250d360f0583c83315f5a3c71611f8d127aa68d91a161bd14b263e2c7501f038946954d5e24ece078024fe310d47530 SHA512 d31e7f845e52609e2b4fa22fe785507db8869ca5efd71aaaa2b4b2889eeda50f184617367918a904e82b48a2080e899c897e02c0b64df079f093b3362e6bed20
 MISC metadata.xml 425 BLAKE2B fced594d29b6f96ad3ec46d47640cf06d62bf20fdcc4849120c189d9dfc84dbc883756c38cb91f972d8d29184e1483393bf55f8c122702032e533d15b44690c9 SHA512 2fce22d02ab3c395d452d3a1312b3f01cc1791177749931b2d20fda56437f38229da616b0993deaf42561d563fdb953305de886e92fbff14a94a7cec19ae2b73
diff --git a/games-arcade/bomns/bomns-0.99.2.ebuild b/games-arcade/bomns/bomns-0.99.2-r1.ebuild
index 37632fd1375c..bd574f113189 100644
--- a/games-arcade/bomns/bomns-0.99.2.ebuild
+++ b/games-arcade/bomns/bomns-0.99.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools flag-o-matic games
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="A fast-paced multiplayer deathmatch arcade game"
 HOMEPAGE="http://greenridge.sourceforge.net"
@@ -13,36 +14,42 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk editor"
 
-DEPEND="media-libs/libsdl[video]
+DEPEND="
+	media-libs/libsdl[video]
 	media-libs/sdl-mixer
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND=${DEPEND}
+	gtk? ( x11-libs/gtk+:2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fpe.patch
+)
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e "/appicondir/s:\$(prefix):/usr:" \
 		-e "/desktopdir/s:\$(prefix):/usr:" \
 		$(find icons -name Makefile.am) \
 		Makefile.am || die
+
 	sed -i \
-		-e "s:\$*[({]prefix[})]/share:${GAMES_DATADIR}:" \
+		-e "s:\$*[({]prefix[})]/share:/var/lib/:" \
 		configure.in \
 		graphics/Makefile.am \
 		levels/Makefile.am \
 		sounds/Makefile.am || die
-	epatch "${FILESDIR}"/${P}-fpe.patch
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_configure() {
 	filter-flags -fforce-addr
-	egamesconf \
+	econf \
 		--disable-launcher1 \
 		$(use_enable gtk launcher2) \
 		$(use_enable editor)
 }
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-arcade/bomns/files/bomns-0.99.2-fpe.patch b/games-arcade/bomns/files/bomns-0.99.2-fpe.patch
index 3a9e39c241af..273212a4f6e1 100644
--- a/games-arcade/bomns/files/bomns-0.99.2-fpe.patch
+++ b/games-arcade/bomns/files/bomns-0.99.2-fpe.patch
@@ -1,5 +1,5 @@
---- src/bomns.cpp.old	2015-01-03 18:44:59.947689613 +0100
-+++ src/bomns.cpp	2015-01-03 18:47:29.854777276 +0100
+--- a/src/bomns.cpp
++++ b/src/bomns.cpp
 @@ -432,7 +432,10 @@
        if(g_bShowFps)
        {
diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest
index e62eac1e331f..8b4209617c6d 100644
--- a/games-arcade/briquolo/Manifest
+++ b/games-arcade/briquolo/Manifest
@@ -1,5 +1,6 @@
-AUX briquolo-0.5.7-gcc43.patch 2954 BLAKE2B 40661c665dadefa60d7b08f0b7a2873beb291a4f4feafe3c3c3807d236ff8bbc743ad600843e19086d16e5eb40f23fe59ec3df14b28bb35c8a7bf7f134648ef4 SHA512 fdee3f69b425591969a351001722a8820d1b78b0107a358c6f60b6c40636a88f1ad657020ed80edd5403f804e3db7af181ba89235e08f660768e4b53f59f499a
-AUX briquolo-0.5.7-libpng14.patch 1058 BLAKE2B d34416489d59adbcbc2d406a6f5983056f1f7c36f2de506ddf881796c8717e471c4c043d9292604ed8f36b1a02642c281827d432e6b3723b2af1e5f374985760 SHA512 0d936eaf6bcb4de420ac45d2d0f41cee8b5b533e329946ddb656da689397e435ceec036ecba53abdec01a52964d56e23dce63d858c4caf77a7e997072ab4da13
+AUX briquolo-0.5.7-gcc43.patch 1967 BLAKE2B 0d7347e002022d12b95f3791beabc5b62e8f89bfccb0581b5907fcba024c6666962b50b50ef8a2bc3f4fcd8adb9b148ba7c70a0ee509f245444e9d4949f86bb8 SHA512 deb255f7201e3714b9a230a6b228d2789b9eba3a85fb930b92277a57c07bc8ac6a38f7028e3cfab8a298ad4833fe61c1dbcade3f0ac06381668dca337e1b8ca5
+AUX briquolo-0.5.7-libpng14.patch 1062 BLAKE2B 18049d54ed528cdbdfc712b85706b224609f05b129fa737aa4340fa25ee6b03f6b8e4eb764593781a93ab08dbf8229aee495fe809170fea0de1721477b1d6379 SHA512 0086a0cc8862c5c1c2000f8776bfcec1812a626eecdb15df4785bbd476e88fd55100d3f47877948c2af7500aba8f60f6c61fb19667e3823670a64f17eaa9c1b8
+AUX briquolo-0.5.7-respect-AR.patch 193 BLAKE2B c8594ba787c551a5f7a03ead31a79f55827dd879f245761f0556e5da61b88e5d6bd58861d7ff62d084bdc17da3be1ebe8c99eb1750cd19175ade6101d1d993a2 SHA512 027b30d972abf32644a45ea04cee69d73fa55a4292ba47a3de6b87a817e3e9bea00b28072864365f451948ea9aa1993de400523956be43a730bf74391e96ded0
 DIST briquolo-0.5.7.tar.bz2 2588084 BLAKE2B 4ec87a161df72f9cc0df592a5b18cdf7a42e9f66675b6eeec20f57f6be599942940eb341dc4927405a1402f1356f52bdd1bea2a6b72c5f36abf229c1ef42e5be SHA512 4ef78193c80ac3554b72149b8da9b5cfd5b8fd68932e5b52666d74642e94a7a3a596dbb6d2865cba526929dd6d9be89743847d5e77b6fbc687c32394bc3be3d2
-EBUILD briquolo-0.5.7.ebuild 1135 BLAKE2B a40a56a0540fe4d9dec44f629aa71851daf79b0d8101ebaa73c0461c8d650cfba48918045a9a8296c749af034065d8ea288c823cd8cbf71f717e17a96aedc94f SHA512 7cf0ea9fcf2b481e71af9973aa7d658771b4fcccb0dc314b545d9a7af4927cd1d3fd9155110b43e342ea67a3306d7c0957076417a231ee2ad6685e57b54c4165
+EBUILD briquolo-0.5.7.ebuild 1206 BLAKE2B 9c8e4268007e49e425a2c37ddc7335c585c064e01534a47e18d1a86fbbef180bab4bfaa766fb355c45c9f9e0f14b4a40d089808d6cf38d07976ab33f92548690 SHA512 e1d911fe8c3541334d81a77c47b15be3c6e63d97d2b09b95a9e179c7bfdece32edf3c04016e2011d9f75e355f0bde4f9893895036b8ad6f2bc3151edf12e72c8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index 07776ecc7735..d58d4462cad1 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="Breakout with 3D representation based on OpenGL"
 HOMEPAGE="http://briquolo.free.fr/en/index.html"
@@ -13,39 +14,48 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/libsdl[joystick,sound,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	media-libs/libpng:0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-respect-AR.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-	# no thanks we'll take care of it.
+	default
+
+	# No thanks, we'll take care of it.
 	sed -i \
 		-e '/^SUBDIRS/s/desktop//' \
-		Makefile.in || die
+		Makefile.{in,am} || die
 	sed -i \
 		-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
 		-e 's:=.*share/locale:=/usr/share/locale:' \
-		configure || die
+		configure{,.ac} || die
 	sed -i \
 		-e 's:$(datadir)/locale:/usr/share/locale:' \
 		po/Makefile.in.in || die
+
+	eautoreconf
 }
 
 src_configure() {
-	egamesconf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
 	doicon desktop/briquolo.svg
 	make_desktop_entry briquolo Briquolo
-	prepgamesdirs
 }
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
index 13e932a1c69e..ba2690792dd5 100644
--- a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
@@ -1,6 +1,5 @@
-diff -ru src.orig/Constante.cpp src/Constante.cpp
---- src.orig/Constante.cpp	2008-03-22 05:40:33.000000000 -0400
-+++ src/Constante.cpp	2008-06-11 23:16:46.000000000 -0400
+--- a/src/Constante.cpp
++++ b/src/Constante.cpp
 @@ -27,6 +27,7 @@
  #define DATADIR_BRIQUOLO "./"
  #define PACKAGE "briquolo"
@@ -9,9 +8,8 @@ diff -ru src.orig/Constante.cpp src/Constante.cpp
  
  #ifdef WIN32
  #define WIN32_LEAN_AND_MEAN
-diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp
---- src.orig/MOGL/MOGL_EnsembleObjet.cpp	2008-03-24 09:12:36.000000000 -0400
-+++ src/MOGL/MOGL_EnsembleObjet.cpp	2008-06-11 23:17:11.000000000 -0400
+--- a/src/MOGL/MOGL_EnsembleObjet.cpp
++++ b/src/MOGL/MOGL_EnsembleObjet.cpp
 @@ -24,7 +24,8 @@
  #include "MOGL_Armature.h"
  #include "MOGL_Peau.h"
@@ -22,9 +20,8 @@ diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp
  
  //#include <mmsystem.h>
  
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObjet.cpp
---- src.orig/MOGL/MOGL_GestionnaireObjet.cpp	2008-03-24 08:56:13.000000000 -0400
-+++ src/MOGL/MOGL_GestionnaireObjet.cpp	2008-06-11 23:18:45.000000000 -0400
+--- a/src/MOGL/MOGL_GestionnaireObjet.cpp
++++ b/src/MOGL/MOGL_GestionnaireObjet.cpp
 @@ -21,6 +21,7 @@
   *****************************************************************************/
  #include "../I18n.h"
@@ -33,9 +30,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObje
  
  bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char * p_NomFichier, const MOGL_GestionnaireTexture & p_GM,
                                                       MOGL_Objet & p_Objet)
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet.h
---- src.orig/MOGL/MOGL_GestionnaireObjet.h	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_GestionnaireObjet.h	2008-06-11 23:20:07.000000000 -0400
+--- a/src/MOGL/MOGL_GestionnaireObjet.h
++++ b/src/MOGL/MOGL_GestionnaireObjet.h
 @@ -24,7 +24,8 @@
  
  #include <vector>
@@ -46,9 +42,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet.
  
  #include "MOGL_Triangle.h"
  #include "MOGL_Objet.h"
-diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h
---- src.orig/MOGL/MOGL_Image.h	2006-03-07 15:53:11.000000000 -0500
-+++ src/MOGL/MOGL_Image.h	2008-06-11 23:20:51.000000000 -0400
+--- a/src/MOGL/MOGL_Image.h
++++ b/src/MOGL/MOGL_Image.h
 @@ -24,6 +24,7 @@
  
  #include "MOGL_Structure.h"
@@ -57,9 +52,8 @@ diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h
  
  using namespace std;
  
-diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp
---- src.orig/MOGL/MOGL_Objet.cpp	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_Objet.cpp	2008-06-11 23:21:05.000000000 -0400
+--- a/src/MOGL/MOGL_Objet.cpp
++++ b/src/MOGL/MOGL_Objet.cpp
 @@ -20,6 +20,7 @@
   *
   *****************************************************************************/
@@ -68,9 +62,8 @@ diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp
  
  //MOGL_Objet::MOGL_Objet(): MOGL_ObjetAbstrait(), MOGL_ElementArbre()
  MOGL_Objet::MOGL_Objet(): MOGL_Noeud(), _ModifieTriangle(true), _ModifieStrip(true),
-diff -ru src.orig/MOGL/MOGL_Peau.cpp src/MOGL/MOGL_Peau.cpp
---- src.orig/MOGL/MOGL_Peau.cpp	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_Peau.cpp	2008-06-11 23:21:17.000000000 -0400
+--- a/src/MOGL/MOGL_Peau.cpp
++++ b/src/MOGL/MOGL_Peau.cpp
 @@ -20,6 +20,7 @@
   *
   *****************************************************************************/
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
index d325bac02578..201922e24e61 100644
--- a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=308667
 
---- src/MOGL/MOGL_Image.cpp
-+++ src/MOGL/MOGL_Image.cpp
+--- a/src/MOGL/MOGL_Image.cpp
++++ b/src/MOGL/MOGL_Image.cpp
 @@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char *
    info_ptr = png_create_info_struct(png_ptr);
    if (info_ptr == NULL)
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch b/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch
new file mode 100644
index 000000000000..2cccf8341e9a
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE(dist-bzip2)
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC
diff --git a/games-arcade/bumprace/Manifest b/games-arcade/bumprace/Manifest
index d5b2a5b8cef6..14f53db8e485 100644
--- a/games-arcade/bumprace/Manifest
+++ b/games-arcade/bumprace/Manifest
@@ -1,3 +1,3 @@
 DIST bumprace-1.5.3.tar.gz 906459 BLAKE2B d08d1760cfb01eb7426c012233152007ba196e1ae6774d0474d3b9dcfa45608d08d6f18b9ea5c337c6f7f78eb13e887d1e2a4b92e48792f5f481a7efb123fbc2 SHA512 35bc35e82f587dce9f096f68b74f4fe0c0020f7ee2f972f9c0a99473a2dfbd9e61412c030a93194165d9d5968f6b68a6d1656f8e77dd46352f00a53e47ad94c6
-EBUILD bumprace-1.5.3.ebuild 579 BLAKE2B 7a52e95aec1c81daa9a5c2d5f914303e0320c8b047886a441f40713cc0b859f353c86a8e1310536a9214a971a75d22182b5017535cb38c2ad53051c0603ddbbc SHA512 e4bb5036da6f2651af562fb54996662889232c85659a73addbce678a338b315c580da32723778d6eb56ee6c3943363cd26ec0e564f365523f3c925439cb0f7eb
+EBUILD bumprace-1.5.3-r1.ebuild 554 BLAKE2B 3654616c425a55b69a43236f5435482b8d066a8b00d611594c8827b3bba51c1985bf84eb9a1ef81b8750adacb33561e994c0bd6a88815e49075daa309ff8ad59 SHA512 7940512a8dac29893f4746e34929f58db65692e88762a619837920414849eb69a61eb5de30949f2d2fa9b7a9df1bb3924f2f219095b60ea003fe82f58ae914fa
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/bumprace/bumprace-1.5.3.ebuild b/games-arcade/bumprace/bumprace-1.5.3-r1.ebuild
index cd28a4e023c1..e283536bccab 100644
--- a/games-arcade/bumprace/bumprace-1.5.3.ebuild
+++ b/games-arcade/bumprace/bumprace-1.5.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop
 
 DESCRIPTION="simple arcade racing game"
 HOMEPAGE="http://www.linux-games.com/bumprace/"
@@ -11,17 +12,17 @@ SRC_URI="http://user.cs.tu-berlin.de/~karlb/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[gif,jpeg,png]
 	media-libs/sdl-mixer[mod]
 	virtual/jpeg:0
 	sys-libs/zlib
-	media-libs/sdl-image[gif,jpeg,png]"
-RDEPEND=${DEPEND}
+"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	default
 	make_desktop_entry bumprace BumpRace
-	prepgamesdirs
 }
diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
index 8a2114997baa..6d89612a99ad 100644
--- a/games-arcade/burgerspace/Manifest
+++ b/games-arcade/burgerspace/Manifest
@@ -1,3 +1,3 @@
 DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee
-EBUILD burgerspace-1.9.2.ebuild 1076 BLAKE2B 168ec9c072185c1e9121c5f14c3c09dc4c36a1cdbc57701b0bf008e1dd7f527182a113a649722f77cac3fc1c8315b4d3c114b129065a5709e1a2f0812042ef9a SHA512 0a238217dca88a8e908aa9113a6dd9004803df6cd91d4c8d1ae0adbf651b921dd3df8b8eb7ef3837b99fc779203f2935db2ffefe8335dd6de9778f4322a58e44
+EBUILD burgerspace-1.9.2-r1.ebuild 1072 BLAKE2B 6fe0998fa8432b88aabb3a678f1896663d04072ebba2898f004ba53367a69fe3fc07da253204b49ce26ff21ad180625e0969a5f3baa21b6399e4514dabb80b55 SHA512 0df0d428714509daeb313ba90170a84187df0a076ffb3e3453ff311d949a1a437860c20d6a8bd65be402196c9e23404b6e6cc3a735b48d06e1a1714bacb41a7d
 MISC metadata.xml 335 BLAKE2B 5b9037f7c7ada3f92d51b965d65b0f47af853b60c4409d1e04522485eeb3a3783f58c4e6e5cb1dfb759d27d09254fae5593f0d12947ae3eb286d7867a6b7ca99 SHA512 78b9833542c259f024f8041b1e26710f42ab792919970e8d5e73c8da539c74e62bec318f5ee18d09b26baee3c17bc49f14f3e70a1032da46acd587c934407cd4
diff --git a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
index 2dea3767701f..11de206aa181 100644
--- a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild
+++ b/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools games
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
 HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
@@ -12,36 +13,40 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="network"
-RESTRICT="test"  # doesn't really test anything
+RESTRICT="test" # doesn't really test anything
 
 RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
 		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
 		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
 		src/Makefile.am \
 		|| die
+
 	sed -i \
 		-e "/Categories/s:Application;::" \
 		-e "/Icon/s:\..*::" \
 		-e "/Terminal/s:0:false:" \
 		src/burgerspace.desktop.in \
 		|| die
+
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		$(use_with network)
 }
 
 src_install() {
 	emake -C src DESTDIR="${D}" install
+
 	doman doc/${PN}.6
 	dodoc AUTHORS NEWS README THANKS
-	prepgamesdirs
 }
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
index 513e4cb9619e..895537ee86a8 100644
--- a/games-arcade/cavezofphear/Manifest
+++ b/games-arcade/cavezofphear/Manifest
@@ -1,5 +1,5 @@
-AUX cavezofphear-0.5.1-gentoo.patch 876 BLAKE2B fe2ff1ff1b1698ecbe06492bd80b8104908def9b1d4810b2c6b569e55d71a420a70a2d731555cee3a42adb40fa76b2964e2ba57105a1b47c00f54ca48851b213 SHA512 ee3d37644d1b94b39db2274eac0eadd3a823736177da317a2476238dbebe1a8a5af466f01771249e59aed838c684c9fd59fe7868aac3f1e1b89a75863bc49af4
+AUX cavezofphear-0.5.1-gentoo.patch 565 BLAKE2B 046d26a9733c27b41c28edc426831c1f56c16b29913569778dc8e60a5330094643420e5af630c5cdbbcc032d540701f6735d63d47dae57967c9ec92ae51dd79b SHA512 f30eb86a46ee30a7dabe09dcea977db4855cae901a71a5086526abaf152e0051e423a352e75706226685bfd7a91cdb22525442788e21bf6aa3df9c7269dd9735
 AUX cavezofphear-0.5.1-no-common.patch 438 BLAKE2B 919c2d0f35ad757b49ae742a4bffe84e2eda7c1e055e08a30e14e47c461994191792a500825b15b13bd35322f9e737fc97886753c0b221bc2fde80fee45f4f81 SHA512 49c835a11f03ac1fe0e8ba17281dc0fd4f1092bc60cbb0354c3c8036320cb6831f5d4908fedbfc2a95186e514a2d08f6b7c1f2711dbf620a262da4369bb2f2a8
 DIST phear-0.5.1.tar.bz2 25750 BLAKE2B 0b2c4a6f51fadd48a1e01dd5ac2072984368b3314fd3df01d4ad8adfdc0d031d443ac5f950651d4fff4ff5019b61868532eff0ed3d31bd6b2ba0f97893391d6a SHA512 23326a63acc06e77a1dd3505345940f8ef31b671282e00f623b181fe1cdbdf1b7e4b37a6e91ea430348a02239ed1450736dc075ea3af3eee0e8acb115aa89f3b
-EBUILD cavezofphear-0.5.1.ebuild 806 BLAKE2B 7960ffdbfc3c760c8a35d1ec5dda7e74e61d72b09c29b22c4c5b06163eb24eae1cf2525646cd632d625abae44dc13644ec34faf2212e2173caf90b7efde03821 SHA512 6fad3d356a96a477bfe0a9f14acf82ce079195115487827d4b2f2b5e9104afd4f4f6af9e2c33f1b8866fe04d0977114a1cca41fade98284a98ab760c5b2cd2ee
+EBUILD cavezofphear-0.5.1-r1.ebuild 835 BLAKE2B 72d96d08eac3182c06c83893e5062a50776822ca67162f0d85398af7a8c2e1b4d42e574634454cc7bb601a14fa0619651bb9614d6bae858135b06adbd4ff5346 SHA512 21310b82d64d3560013035bce909be75b44a8d95298bf4ec4d1837a2841d2db0fd0912c06a6699b632bbcaf4632186d8166ee16e74bbcbacd69da5ef226c17cf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
index 1069f5a9ce3c..714985d68031 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
@@ -1,36 +1,44 @@
-# 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 games
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
 HOMEPAGE="http://www.x86.no/cavezofphear/"
 SRC_URI="mirror://gentoo/phear-${PV}.tar.bz2"
+S="${WORKDIR}"/${P/cavezof/}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-5:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND=">=sys-libs/ncurses-5:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${P/cavezof/}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-no-common.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-no-common.patch
+	default
+
 	sed -i \
-		-e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
+		-e "s:get_data_dir(.):\"/usr/share/${PN}/\":" \
 		src/{chk.c,main.c,gplot.c} \
 		|| die
 }
 
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
 src_install() {
-	dogamesbin src/phear
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin src/phear
+	insinto /usr/share/${PN}
 	doins -r data/*
 	dodoc ChangeLog README* TODO
-	prepgamesdirs
 }
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
index fbf79af44519..e3cb92c17a01 100644
--- a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile
---- phear-0.5.1.orig/Makefile	2007-02-27 06:21:55.000000000 -0500
-+++ phear-0.5.1/Makefile	2013-01-18 02:09:56.403224104 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -2,7 +2,7 @@
  DESTDIR_DATA = /usr/local/share
  
@@ -10,9 +9,8 @@ diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile
  clean:
  	rm -f phear editor
  install:
-diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile
---- phear-0.5.1.orig/src/Makefile	2011-12-12 07:26:03.000000000 -0500
-+++ phear-0.5.1/src/Makefile	2013-01-18 02:10:48.218423433 -0500
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -2,10 +2,8 @@
  
  DESTDIR = ..
@@ -21,7 +19,7 @@ diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile
  INSTALL = install
 -CFLAGS ?= -s -Wall -O2
 -LDFLAGS += -lncurses
-+LDLIBS = `pkg-config ncurses --libs`
++LDLIBS = `${PKG_CONFIG} ncurses --libs`
  
  all: phear install clean
  
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 7255eb58eecd..1b0d2be610df 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,5 +1,5 @@
 AUX commandergenius-2.3.1-build.patch 451 BLAKE2B 5c82e9919262fd55ec89069c55de2ba0f18eea2af4587776c353345aef7fb1657763abfcf0956856dae3707a65f0e33210dc521f95d3a0c863461bdb851667d6 SHA512 7b567072137af294b876da4d3701deddc5bf80c52c7a9bf7f0e266885f2a5cc61b7f495725e9d3fdaf3527cf92da0437c8ed1b90f34f9925579c2fe5da8484fb
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
 DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b
-EBUILD commandergenius-2.4.0.ebuild 2192 BLAKE2B 6f56b9049b899ddc3c253e6d33ab901f3c993aabe1b2b093e54aee81b162a340e43fa43a34243a87d4ff7f598c67be3ba7f8530fad8a25a2941f6bb696b07781 SHA512 8413ea6c69c56162c4d4d630fcd1911cc01ff88eb712bd94033955eb5dd08bc691f8572afae543de4a6b612ec10c336768791ee017b3d68249bcfcb0a56a9084
+EBUILD commandergenius-2.4.0.ebuild 2184 BLAKE2B 50a83d6957bcd37e31a31b5809ed7b8fe3e4265605af0fec44b018243a831ce851eabbb4af73b900405a4a2ba29c0f9711292bf1208baa916e51d2bd42a96587 SHA512 aa44752ba8bb84f4b8cf140e85135a98d2ab60390f1e6e4a128b8441d0a6a6f65e60a8eecccb3140721b54bfb3240aac0b16ed8056177fa98a0af94ab0581e9a
 MISC metadata.xml 506 BLAKE2B 25e8355a252ad989de2d71ee53d2163ecf259444c76c1b2ce01975e9fb711dd54dfe9d6a0d325ffd4fa21c62042d99a530a55cf37a9d1650b6d7a7b19b50eb28 SHA512 96c6feb3c9584aef0e25ec5ba1876f300421eaa0977e7cadbd5fe419e16e39891d26e2e322db6bf22b4570b79e69f76bbf268887fc6a698cbd7f37908c675ef8
diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
index 9baded9ec4a0..53cd288ac279 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit desktop python-single-r1 xdg cmake
+inherit python-single-r1 xdg cmake
 
 MY_PN="Commander-Genius"
 MY_P="${MY_PN}-v${PV}"
diff --git a/games-arcade/crack-attack/Manifest b/games-arcade/crack-attack/Manifest
index ecfcc787d041..343f0170eb46 100644
--- a/games-arcade/crack-attack/Manifest
+++ b/games-arcade/crack-attack/Manifest
@@ -1,6 +1,7 @@
 AUX crack-attack-1.1.14-avoid_bashisms.patch 535 BLAKE2B 2fd7517e9904d2c58dc288f39ac75c1c45ea051c3f8abc799531de9ee7ea263327b8d3293311a8ca835362df22a77cb3805f17f1462cbb8beb517451fce0d973 SHA512 d1571ba1fb658001b5b848070a390c74e6869573ce9ea93d26e15909de86606174883b105ccd1bcbbb0afb73908f5ed872fa4eca02a4bbea68df01261f03cc21
 AUX crack-attack-1.1.14-gcc43.patch 176 BLAKE2B 31ae3d2ada1212633ded026c9fbbdd517e7a7cc9742ad24036698c474a4b173cb7521857f6a41b7fe72cfff78f5db89236cc7ef3920658c7b3dc43a60cee793a SHA512 e9e5cc3c93bb00ad8e8b7d6bafd2035c13673fc27217fa6ba3d66ad285bd4d9f6048fbb933723d91e4c60495175fd065acc6663bcce0b2fb606f23f4ecbf4fb3
 AUX crack-attack-1.1.14-glut.patch 385 BLAKE2B 1f1b3830199c3488e71a6055b9db1092b1a730e194ed8f68974e6b8f867a8399b5d3f5b49011839a3e07a9265bca7e5e0f3d33ea634ffcb92fa68aa80dc4a3aa SHA512 d39bbd78172d9454a3f2244dff21e9f538c2235e86a3d8a53e855d0eb4f70403ff75b7fcaf774ad2054f77e9002786a802d1e3cfcc8d8dbb3ba082379e037949
+AUX sdl.m4 6571 BLAKE2B 42d5119724387c901f6bf3353f223486f118bcb90d1cecf1cfa2c53e797b27955c39c3aeb5bf77ed5d5c78338dbf3f1dd47dac519342a439bd8f347aa2f0c7ce SHA512 91e17298cd6b98c81dab97e6c25c9d674c14a1a27b1a18f9f0ee1d9ab235fe8e70ee7f9886dd1bac535c9e4d9ba6545520f4526e3c5c8934cfdf29f3928242d2
 DIST crack-attack-1.1.14.tar.bz2 801404 BLAKE2B 78c6fa9ee16ddb341aa1f11d1964c7036c85d0b1f0145c6fe57d585eb4c237fdb33d351f0d5510eabaf7666a63e74f8afbe0f09952ec1d4c5713a87a89963b82 SHA512 1afc1a59e25359a82cabc33a1f999e1166dcf74c031c29a366f8414989bc7c32b9a40e467ee40a37901f2bd08f4569fed25c4d3021b1a75254614840410a7bfa
-EBUILD crack-attack-1.1.14-r2.ebuild 1058 BLAKE2B 016bc128ee8877120c57539aaaf8bd58d1407acba429b72442a53a8b5963734933f48061eca2ea813339633abc57df1ca618c7eb2ec66ad1cfbf494789fefbfb SHA512 00f8fe172df167b01eee075fdda5cf6d87ffaa62248496d4529be50cb1d5cdae23d41630492859a8e4d0901f52e78736c6e73a4b2763250035d088c3c569bad6
+EBUILD crack-attack-1.1.14-r2.ebuild 1147 BLAKE2B 9bf78d1d7d2b3c50b9290830b1916d8c97b435e012c7627ca8438b125026670e2707532917465aae133f3ab082025778f29f39fdb6df297884e30f23a127daf5 SHA512 8dee3a149893b5496303429eec24c6c76e7881a07424f2cff2c1cf670d1de0844a43d6a56b99fd90928e8d7c5f516166dcaa0e6520e3a4094e278036e58e8b59
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
index 24ca982cd260..8d7f8c43bd2e 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -34,7 +34,12 @@ PATCHES=(
 
 src_prepare() {
 	default
-	eautoreconf
+
+	# SDL macro not bundled
+	# bug #779745
+	cp "${FILESDIR}/sdl.m4" . || die
+	AT_M4DIR="." eautoreconf
+
 	sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
 	touch -r . * */*
 }
diff --git a/games-arcade/crack-attack/files/sdl.m4 b/games-arcade/crack-attack/files/sdl.m4
new file mode 100644
index 000000000000..30e1f2144ee4
--- /dev/null
+++ b/games-arcade/crack-attack/files/sdl.m4
@@ -0,0 +1,180 @@
+# Configure paths for SDL
+# Sam Lantinga 9/21/99
+# stolen from Manish Singh
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+# serial 2
+
+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+dnl
+AC_DEFUN([AM_PATH_SDL],
+[dnl
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+            sdl_prefix="$withval", sdl_prefix="")
+AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+		    , enable_sdltest=yes)
+
+  min_sdl_version=ifelse([$1], ,1.2.0,$1)
+
+  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
+    PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version],
+           [sdl_pc=yes],
+           [sdl_pc=no])
+  else
+    sdl_pc=no
+    if test x$sdl_exec_prefix != x ; then
+      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
+      if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+      fi
+    fi
+    if test x$sdl_prefix != x ; then
+      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
+      if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+      fi
+    fi
+  fi
+
+  if test "x$sdl_pc" = xyes ; then
+    no_sdl=""
+    SDL_CONFIG="pkg-config sdl"
+  else
+    as_save_PATH="$PATH"
+    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
+      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+    fi
+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+    PATH="$as_save_PATH"
+    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+    no_sdl=""
+
+    if test "$SDL_CONFIG" = "no" ; then
+      no_sdl=yes
+    else
+      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
+      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+
+      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+      if test "x$enable_sdltest" = "xyes" ; then
+        ac_save_CFLAGS="$CFLAGS"
+        ac_save_CXXFLAGS="$CXXFLAGS"
+        ac_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $SDL_CFLAGS"
+        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+        LIBS="$LIBS $SDL_LIBS"
+dnl
+dnl Now check if the installed SDL is sufficiently new. (Also sanity
+dnl checks the results of sdl-config to some extent
+dnl
+      rm -f conf.sdltest
+      AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <stdlib.h>
+#include "SDL.h"
+
+int main (int argc, char *argv[])
+{
+  int major, minor, micro;
+  FILE *fp = fopen("conf.sdltest", "w");
+
+  if (fp) fclose(fp);
+
+  if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_sdl_version");
+     exit(1);
+   }
+
+   if (($sdl_major_version > major) ||
+      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+        CFLAGS="$ac_save_CFLAGS"
+        CXXFLAGS="$ac_save_CXXFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+    fi
+    if test "x$no_sdl" = x ; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test "x$no_sdl" = x ; then
+     ifelse([$2], , :, [$2])
+  else
+     if test "$SDL_CONFIG" = "no" ; then
+       echo "*** The sdl-config script installed by SDL could not be found"
+       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+       echo "*** full path to sdl-config."
+     else
+       if test -f conf.sdltest ; then
+        :
+       else
+          echo "*** Could not run SDL test program, checking why..."
+          CFLAGS="$CFLAGS $SDL_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+          LIBS="$LIBS $SDL_LIBS"
+          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
+]], [[ return 0; ]])],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     SDL_CFLAGS=""
+     SDL_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(SDL_CFLAGS)
+  AC_SUBST(SDL_LIBS)
+  rm -f conf.sdltest
+])
diff --git a/games-arcade/dynamitejack/Manifest b/games-arcade/dynamitejack/Manifest
index 723b7ab79c49..8fedd29620a3 100644
--- a/games-arcade/dynamitejack/Manifest
+++ b/games-arcade/dynamitejack/Manifest
@@ -1,3 +1,3 @@
 DIST dynamitejack-1.0.23.tgz 54195417 BLAKE2B 5cb659be0a76617c6a09c2dd696daaaa23ec9d24918a842e1dcc2e5b294c4e4c19f80f4dff92a5e539469a048bda2f1f61f9240569f8c0d2fc8e0e2147b55d39 SHA512 57897194244ded8d41ef0e7704fd973a58fe52dbc01b7dceed2a47694f7cc3e75d732547532bc7be4dd7d510572dedb85188da413b5857f52182799427243c4d
-EBUILD dynamitejack-1.0.23-r1.ebuild 1727 BLAKE2B b9f47388e66fdb327e4889a845d71bec4fe4367c75c6c764fd9a65c61bed8774e0397108fc2c22d19933a7452687e13451431fd0aa6c9c2187ebde7abcc8a982 SHA512 3b4562ea770ebdae5feedcce86a141e1f469321a22a2c6f558af293916bf2d989409ec799bf413ae1b58b3dbbae3e504e20beaeaee73c8ea615e0912cd21223a
+EBUILD dynamitejack-1.0.23-r2.ebuild 1699 BLAKE2B 59ebda4b43ed737a0eeab6b682504d121ca211555f8c30ac612bfcde82c3dc9e101b46afedfda7dfafae747ae4de379b1bcd49365cf8f442ce07446d0c1da3e3 SHA512 0c1f46c310c377b46d3281abd65421468e574aa1b43eac4974c7607724a02057499b73731b44870f5bca97ef68860642999015d5293b755c1daf78f4bb5c273a
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23-r2.ebuild
index 9929eac3aad0..17044c67a9d9 100644
--- a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
+++ b/games-arcade/dynamitejack/dynamitejack-1.0.23-r2.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: icon
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="A stealth game with bombs in glorious 2D"
 HOMEPAGE="http://www.galcon.com/dynamitejack/"
 SRC_URI="${P}.tgz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
 RESTRICT="bindist fetch splitdebug"
 
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+MYGAMEDIR=/opt/${PN}
 QA_PREBUILT="${MYGAMEDIR#/}/bin/*"
 
 # linked to pulseaudio
@@ -40,8 +42,6 @@ RDEPEND="
 	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 	>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]"
 
-S=${WORKDIR}/${PN}
-
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
@@ -49,6 +49,8 @@ pkg_nofetch() {
 }
 
 src_prepare() {
+	default
+
 	rm run_me || die
 	mv LINUX.txt "${T}"/ || die
 }
@@ -59,9 +61,8 @@ src_install() {
 	insinto "${MYGAMEDIR}"
 	doins -r *
 
-	games_make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin"
+	make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin"
 	make_desktop_entry ${PN}
 
 	fperms +x "${MYGAMEDIR}"/bin/main
-	prepgamesdirs
 }
diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index 25c8b07d5a6e..b9488306c57c 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -1,7 +1,7 @@
-AUX emilia-pinball-0.3.1-gcc46.patch 887 BLAKE2B 1b850fc066b2f33edde6c5f9e0ce58af86b4ae5eda7bb77b3d364e45548572b48f34a7e0a50f9ca660585ca0282e0ec9c3031449ca9ffa7b60d2c3cae920c794 SHA512 758d2d42f40b7d020aeeef75331b6a392c18eb9f9f34242d449ee233ef2f1b12900b69d572a40930a6dbd986e98be9258ccb2130746e36c8729c011ce294fda3
-AUX emilia-pinball-0.3.1-glibc210.patch 379 BLAKE2B 5eb1a6885265f7c5ca3ca73108ba54890e0f1551e8b0efcfca62637385b9700a900ce7181c7f5a7100f265c82df7b0ef98765bc6bd05ad079e7941b12d384541 SHA512 a949474aa76dc0b503635c40fb8b641daaab59b51d1d680fc9ac3f6e94566f9064526fe21107e5e549a02c3264dfa0fc6d94a5f8a833a88defd4e9b3a6bb9be0
-AUX emilia-pinball-0.3.1-libtool.patch 2371 BLAKE2B 625fc092dfe779ca1cb7b17c305e21de5113314f59ea7e2cd214b59a1c49b45668b3a76e9e56141d18df0e42eb72c295cf84aa4df50d7e070b6b1864250b506b SHA512 c60940620ba70c725774c9e0dfb930d2e5760fad9e64ec951ca3ab973f3e9f0884d88c0e7b4d8bf01f91651a7e5bd2111bcf5a38a63b46319436c7d2f270d71e
-AUX emilia-pinball-0.3.1-parallel.patch 428 BLAKE2B 368bf4e511f362e3daff200bee164fc0fa5c8bedde5f81cbe8778159e5f5157ff7a48b611541942703cc76f78e85b8e1b8bc42b6a305770feaf4577204576071 SHA512 8c8d0ef2bbb59579cf3e0f12e624bc28c27e810cad2d140a4c85f998d482101d97bdb7109fd01fb4bb9f2e77369c503b51c5a704b2f0768e570e7eb094f4f3c6
+AUX emilia-pinball-0.3.1-gcc46.patch 671 BLAKE2B 89e637e5110f00abc0e8b1eaed28cdf0b5ea86c0441655530659cac0772f9d0bb00f7183f955cc9d0cc72bc306f6dc4a951537923a96237a4706823a5172c927 SHA512 e214820d787c2c9170759f4cf796ed43d49a7831f3f589eea4c216bf2b8180d0f596a12e990da4d4b5e61c55ecb5bca18834696716c1c05b95eda1343a37c90c
+AUX emilia-pinball-0.3.1-glibc210.patch 383 BLAKE2B 3d4eaf146dcef5dacbc1e61d667a73972e2c67d1881fe60b7724720cf391f32103f039b56d32b55d32b93e16cbb1179f681f417f41dbd56e8047e43c03c9d1e4 SHA512 67d0494816f1d4827a8b88e52acc8ef9ca687956ecdc725051df367205d75f437bc66501be9277a2abc1095d978b9b6fafda36c041a7b0825d66aee34584b691
+AUX emilia-pinball-0.3.1-libtool.patch 1683 BLAKE2B 8ee0b3bf1a913310993e45a37b3cd0b59adcc32e004994a093d63d5cfcaa5c22cd3fa80f0407b6b77f8381d9bf6b2dc36dc4396406f703d7925ee93bef3bd0c7 SHA512 43f09fd61f158c62abec979f45d019821099789318b22394618f94f5b49a15cda3759cbe4f4fc74f7dbe5f89856138a0d1dcd5fd335817bd71326d90ab50c719
+AUX emilia-pinball-0.3.1-parallel.patch 356 BLAKE2B 5944a0dcec80a6c593be6c451912a6eed1d6afe7998ff48e83dd3d8b8d635c117a253c9a2dee288e3d38d6e77ad05eac83a4c46789389ea329f8be0a3d8177bf SHA512 54d467c4e7aae9902c3c4cfde999c2c8245bb92c6ede5464c229852ba0a29858e86a0781408eb7de40022b13635ef7826323ef510e80ef2b9758c1bdbdb9aff0
 DIST pinball-0.3.1.tar.gz 6082982 BLAKE2B 307fd8fa6a6a64a15423f2cdacf6711affec4d0a94beca4c660316fa2db268b857fe80d3a672a078fd4454e858fdbf235ab3c62ba9695ee6df422b56536ba2d2 SHA512 d54f2635f583be8a7e4bf3463c69c1ab368e1c069dd7c4edffb95df0448faf7e82ddb8f8607d22a7336e2db176134555ca65b613e9d008b38fecb8ad5a818498
-EBUILD emilia-pinball-0.3.1-r1.ebuild 1394 BLAKE2B 8bed8fccd73785e0e96b622b7775e1caf45e8b7c0c97dbbbe4f9819b8d500f8c41d98cbbcd9b42d7c09bfe985c90731dfc0ab5183e74ce98bbdc77695184f49c SHA512 097011fdfb136fb98f1aa840014b904de05461c642dacd3a8b229f3d04cc46210db2bb7ffd11778692370e5d14fb35fa4f56a346051647ccbd667283b2e625e8
+EBUILD emilia-pinball-0.3.1-r2.ebuild 1401 BLAKE2B e49ed85390c012c546176f670a73ba0fdab545abbf222f92f64fb0d658a07998fb16e0eb13b360afff3611c332690f565189bb20a8144b8621ea9cc28cbe43fc SHA512 ecc2a81fef12517337e8162aa8993f145625c807267fb7bd623bc8a89b612db82ccae7c55296ce92bc56c299e93f712919544115eb4251ea03a6f666ef237155
 MISC metadata.xml 330 BLAKE2B 7deaad70c752f4c41009dfd6ec073f972e9ee484d4497c0b23d184cd48bdb5aaa45f2644c412ab2a885aea6655e1a737a612bb65b3d8147272f63a2de932825c SHA512 8432311fd9fb74150e0571245c2afda26de63a3a3671905cb7f221984933e5971c1f5f355517c54b7c31de3a3d3349d06116a4e67c57c44489147af5ae80e8cf
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
index 56747f703846..523439876ec8 100644
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
@@ -1,43 +1,57 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=7
+
+inherit autotools desktop
 
 MY_PN=${PN/emilia-/}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="SDL OpenGL pinball game"
 HOMEPAGE="http://pinball.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="virtual/opengl
-	x11-libs/libSM
+RDEPEND="
+	dev-libs/libltdl:0
 	media-libs/libsdl[joystick,opengl,video,X]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	dev-libs/libltdl:0"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
+	x11-libs/libICE
+	x11-libs/libSM
+	virtual/opengl
+	virtual/glu
+"
+DEPEND="
+	${DEPEND}
+	x11-libs/libXt
+"
 
-S=${WORKDIR}/${MY_P}
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc210.patch
+	"${FILESDIR}"/${P}-libtool.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-parallel.patch
+)
 
 src_prepare() {
-	sed -i -e '/dnl/d' {src,test}/Makefile.am || die #334899
-	epatch "${FILESDIR}"/${P}-glibc210.patch \
-		"${FILESDIR}"/${P}-libtool.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-parallel.patch
-	rm -rf libltdl
+	# bug #334899
+	sed -i -e '/dnl/d' {src,test}/Makefile.am || die
+
+	default
+
+	rm -rf libltdl || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf --with-x
+	econf --with-x
 }
 
 src_compile() {
@@ -46,14 +60,17 @@ src_compile() {
 
 src_install() {
 	default
-	dosym "${GAMES_BINDIR}"/pinball "${GAMES_BINDIR}"/emilia-pinball
-	mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/" || die
-	dodir /usr/bin
-	mv "${D}/${GAMES_BINDIR}/pinball-config" "${D}/usr/bin/" || die
+
+	dosym pinball /usr/bin/emilia-pinball
+
 	sed -i \
 		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
-		"${D}"/usr/bin/pinball-config || die
+		"${ED}"/usr/bin/pinball-config || die
+
 	newicon data/pinball.xpm ${PN}.xpm
 	make_desktop_entry emilia-pinball "Emilia pinball"
-	prepgamesdirs
+
+	fperms -R 660 /var/games/pinball
+	fowners -R root:gamestat /var/games/pinball
+	fperms g+s /usr/bin/pinball
 }
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
index d78779197fce..aef1d672df62 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
@@ -1,5 +1,5 @@
---- base/SignalSender.cpp.old	2011-04-26 09:39:24.303339444 +0200
-+++ base/SignalSender.cpp	2011-04-26 09:39:51.261063162 +0200
+--- a/base/SignalSender.cpp
++++ b/base/SignalSender.cpp
 @@ -11,6 +11,7 @@
  #include "SignalSender.h"
  #include "Group.h"
@@ -8,8 +8,8 @@
  
  SignalSender * SignalSender::p_SignalSender = NULL;
  
---- base/Behavior.cpp.old	2011-04-26 09:36:27.129006665 +0200
-+++ base/Behavior.cpp	2011-04-26 09:36:48.855396752 +0200
+--- a/base/Behavior.cpp
++++ b/base/Behavior.cpp
 @@ -9,6 +9,7 @@
  #include "Private.h"
  #include "Behavior.h"
@@ -18,8 +18,8 @@
  
  Behavior::Behavior() {
  	//EM_COUT("Behavior::Behavior", 1);
---- base/BehaviorVisitor.cpp.old	2011-04-26 09:37:39.759653248 +0200
-+++ base/BehaviorVisitor.cpp	2011-04-26 09:37:54.481594952 +0200
+--- a/base/BehaviorVisitor.cpp
++++ b/base/BehaviorVisitor.cpp
 @@ -9,6 +9,7 @@
  #include "BehaviorVisitor.h"
  #include "Behavior.h"
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
index 800dbeae21a7..12f33cd21c85 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
@@ -1,5 +1,5 @@
---- base/Config.cpp
-+++ base/Config.cpp
+--- a/base/Config.cpp
++++ b/base/Config.cpp
 @@ -423,8 +423,8 @@
    m_sDataDir = string(EM_DATADIR) + "/";
    m_sExeDir = "./";
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
index 437e4eb684a4..a9bc00051bab 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
@@ -1,6 +1,5 @@
-diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
---- pinball-0.3.1.orig/configure.ac	2003-11-21 09:40:18.000000000 +0200
-+++ pinball-0.3.1/configure.ac	2010-03-05 20:41:24.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -14,18 +14,13 @@
  CFLAGS="-g -W -Wall -O2"
  CXXFLAGS="-g -W -Wall -O2"
@@ -22,9 +21,8 @@ diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
  
  dnl *******************************************
  dnl PATHS AND DIRS ****************************
-diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
---- pinball-0.3.1.orig/Makefile.am	2003-12-10 12:15:35.000000000 +0200
-+++ pinball-0.3.1/Makefile.am	2010-03-05 20:36:48.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -33,9 +31,8 @@ diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
  
  EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
  
-diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
---- pinball-0.3.1.orig/src/Makefile.am	2003-11-20 18:46:17.000000000 +0200
-+++ pinball-0.3.1/src/Makefile.am	2010-03-05 20:37:08.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -7,9 +7,9 @@
  
  pinlib_LIBRARIES = libemilia_pin.a
@@ -48,9 +45,8 @@ diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
  pinball_LDFLAGS = -export-dynamic
  
  pinball_SOURCES = Pinball.cpp
-diff -ur pinball-0.3.1.orig/test/Makefile.am pinball-0.3.1/test/Makefile.am
---- pinball-0.3.1.orig/test/Makefile.am	2003-11-20 18:46:17.000000000 +0200
-+++ pinball-0.3.1/test/Makefile.am	2010-03-05 20:36:38.000000000 +0200
+--- a/test/Makefile.am
++++ b/test/Makefile.am
 @@ -6,8 +6,8 @@
  noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
  dnl noinst_PROGRAMS = unittest
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
index 3dfef56090c9..f5857c2b2910 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old	2011-04-26 10:46:05.102070461 +0200
-+++ src/Makefile.am	2011-04-26 10:46:16.872813136 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -9,7 +9,7 @@
  
  INCLUDES = -I../base -I../addon
diff --git a/games-arcade/epiar/Manifest b/games-arcade/epiar/Manifest
index 21cb07e45540..1a23d18677b3 100644
--- a/games-arcade/epiar/Manifest
+++ b/games-arcade/epiar/Manifest
@@ -1,7 +1,13 @@
-AUX epiar-0.5-Makefile.linux.patch 682 BLAKE2B 0794a07f1f4beef8b16e8fc720930cabe3db40941be39c0ed3d1ef66b4a24bab68f9aeb6961b4a4429d4de7fc12dc395dbf7e34c7caf887aedee0cf7af94e584 SHA512 5219be09af0443a780d918306086f9c7792a9fd6e7051806c368db6808017ee9c2897b4093664f9c087e3fe987b22edeb50280f25f615cdbfcdf914c1cf4be47
-AUX epiar-0.5-gcc41.patch 332 BLAKE2B c3d34f29b2d9186d0f6ac14b14bb40e63578764f613b74bd670266dda3885c4542e48e3e95b06a668e01fccc9630a9d0e46f1918f1dda37e1e78840ca890dfb7 SHA512 29de0155e37696c1f2f66060aa6b08d01df13bcf36e2fc20a803bf664bd7a326d4ec70141376305771d2c188e67ddd32d19d5a864c3a8c9c7c5ea329a6e19060
-AUX epiar-0.5-paths.patch 2195 BLAKE2B 995f1d0a39b72be7e1e542a6e799b5d644d62cdb2ad1710f44bc73a82310c148b54113254c4502f499fceaada0aadb5944ec5d370b3ca79c72b208d6197e4c20 SHA512 4f6068f69b6f2367bbc665159f2612da86591d050e5296304b26d613c6579465c632a442251033fdb7803e6cb72c8f70e6118e8c1d43d33f0376863b91ebd037
-AUX epiar-0.5-underlink.patch 818 BLAKE2B 9ab04018e1051d905674b53154e4297be50e1954a79c28f7e70fd47381f9dcd4b452385d05dc38ad2cd117bb4b6b06d9d95727d61fdaf483f4d3940a2c8f6028 SHA512 ada142afdd3de71af454bd1a03c8c406d609deeff7a68a84b7066089761bebcb01dae8e69f7fccbd0cf4f0294789696e1181900c30f857c8b5197c24bab51b2a
+AUX epiar-0.5-Makefile.linux.patch 630 BLAKE2B ff0d5db4ffaf7bcff729949850417f041656e0ad0c5de67fbcec677aa3c98ced091cff58f889d76dac48f08538dd54404b19d63e4209438ee63a2bddd2220412 SHA512 412c512c41c0858c590b6985c02725d6b0d05880ba4db720188227ac95327f0d3feb4feb77ef6bf2ce2bc595d99a341dcd048f6c0d6d1d48def9ed060548da8e
+AUX epiar-0.5-gcc41.patch 260 BLAKE2B e376243f0c9b6c68e214b2dde7944c785cea339968f2e638de5db8b91d314cfe22cc7cffe10586107c8e3850448adf1208889a279bc25fbab53bd3d57ff0f74b SHA512 3c46bf77afe021d7d9c1ee3ef5c6bda3faaf4568d09873c2d39ceb593bc1b07c9cdd3739c9c00ef4cec842a189641a8c729becde5373b54ff04bdc7429fa7075
+AUX epiar-0.5-paths.patch 2215 BLAKE2B 85c4ae921c974a015e5c53e170387d10a12d3f1bd22159dccc6661ea1b7ae42538d9f095a84074e113cc8e5c9d500adffd08b2de01afa8a1100071ef6966e412 SHA512 c5c06280bdba3591e7e12b8fd57726821eaa53244418be4bcc4054ee9fcc1bf28da8ca06a9b3ef1263e8c5ab091e47927c6fe9542d7ce146857e328b5e8517b2
+AUX epiar-0.5-respect-CC.patch 814 BLAKE2B 2a2ccb2f55288796c99ae2ece44b923136ebff2988cf5042510a723e4fa0dd2cc91c7d1847ad5f5ab57d98a07dcd75ad620bb2da6cad8c142d9c202e0f1fe60a SHA512 c7100d1aa495c81a08f644d681f069f527d1d3f80ae8fee8129a3230a8bd359e83d38786db029b7a829fc2a71affa51d0fc958794070de0bd797808c70dfbd5e
+AUX epiar-0.5-underlink.patch 746 BLAKE2B 43f42641e01052db79846da7915bd01769dc8532174aeb81bdba214e345140a2afe88a3f72635ea9545042bbc695a0a4210bf94ee661ef257280bf318483fcbc SHA512 bd832844b2061a9b96c4bb50184a54d08cc591f66429083354f3d88a87f0a49ac1f0db0d0f9d2184beee9f90810e1200d318fe82248212d5d86d383b12367916
+AUX epiar-0.5-unsilence-build.patch 14334 BLAKE2B bcb119fb4d69d33772267deda942b53984bf8e2dae265bca62a39cddde863f041b171e42ce193684cf37899074f3808dbd0939556857927de71033259acfb34b SHA512 eefe9b37a4115bb648fe49a134be8c7675b611bf58061db3d68c03b3e455ec38004d25363e4a735880a3f0d14219ed98966e447111b20428c8d7b590a334f9ae
+AUX epiar-0.5.1-fix-bashisms.patch 1030 BLAKE2B e0e1515239d7817e2048e6ced27a9fc145105553ad29678cc5eabeafd2d8a036e671e919fd4407838869e581fc4c087cc995cce0b479f328b32670332ac9fa3a SHA512 3ce20334179a31c71474db4ed6eb3659feb101545871706fa6c9fe0a437533e0f50ebc2e23a64ba067d01264e1f6855bf84214f7fdaa08a0859a96e7885b9691
+AUX epiar-0.5.1-unbundle-lua5.1.patch 1315 BLAKE2B 1c188513e9b787fc4c331c954d454db11c408756ddf80a5664e069b833fd14bf4c77684674f14922a6d43e2e7f9f1b758339221a0db6d72a821b3e7c1000cc06 SHA512 1a7747609bdaa8f910223f349d42e60fa4bbce3c52952faf56fc262db52b014a970a68669276790e0580bc4b439f47f16eedceeb72843c2119171c8279507b7d
 DIST epiar-0.5.0-src.zip 8809392 BLAKE2B c29c541f5841da91d13f7ccddfa2d2175265a434ae03e2ed87a64cd5c177d7139ff2cf44ec679ec023fe783427868f0f234c6f5f49d0d52ab08be852d424ba59 SHA512 22d8655aefd3aa071de064aeeed40d8780fb32ee702e657c8b8a723c381b6825ae9b5820cf5b29991e14bc264c443d0b24f88656b4997a6270383aa080c15f3e
-EBUILD epiar-0.5-r1.ebuild 1072 BLAKE2B 35e0c44ca0b32f752bbf28b0829b8007edf755d147b3f3d81c0edcb3dce59f903647b5967fffbc73f9b79cdcd5f9f3265ef227ba5650e9cfd4c212e30368c7ff SHA512 2af283cb0c0fc323257d952e80115e5f4c4a64be465789616ab3ba2b116320d5ffc31510c585f67c320531b07c9b0422b0949ed6b0c171f090061a617ad21e23
-MISC metadata.xml 823 BLAKE2B 4ad0d0b974bd58a1d1edd77eb201fa2e236eb6b7a1efee030c8f106a6a016f3ecbf3de213b162a9d0f52d0e0751c4c3905acdaab4cd2d24292c6425620f7c88b SHA512 ef154f46f533f6b255bac62dcdffb84833fee98135e714b9a6b546a9128c3d3be0e7cfe7721ce1ccf302019b414ef1edb4ba92cc43b7024be6881a3cb0d6dffb
+DIST epiar-0.5.1.tar.gz 35576547 BLAKE2B 6648eeccbe86e6935f53d83e5a58aa5839dbec2f5a8c408fd4d8a95e303daa8877c001f5dd4e37a2b72b3c24df646236c850c57c1a1d000fca63177cf075c729 SHA512 ce09aaafc455f3f9721d46a1703bf110ae00041234627b2b5fb4a9489f38672d0d0600b01a65d210728a50b596a51aacddc525d50d1138a6959db421b9384c40
+EBUILD epiar-0.5-r1.ebuild 1197 BLAKE2B 4f2dc48d2b421651d2000adc4b722d3e570fba1c35aba04508f14564b40a47b23bcd2c7c34b654b8fd656aa4a2d50791e08cae2b7814f110c88632796edaa4e4 SHA512 64e732bd2e0c3ca4b5f35a1fc6e4291a0bf391a9ad9125817318572ff74e70e87472c0495de189e1bc5f185754f989c94d4959a351e0bd935286439191271cbc
+EBUILD epiar-0.5.1.ebuild 873 BLAKE2B 41d337a56a03023011212bc858be0b90f7107eee990d149006e93b47dc84a6c545b47d66f27c1d0f30be7eaab3913117ad772cc43ab99ccd8c36d8bb809b8685 SHA512 29a1636387c2a6a8814bdf10c681efa147f67f4bb4e294f036d9ef7b59176a1adcce8364ce1d2f41c9a9ed9e8c4dfab08f39ccec89a81fe9e01f8a23a4691257
+MISC metadata.xml 880 BLAKE2B 4f4dda3a961b4324d6f619579c35cf846f68522deb3d3da44af4632ba2d5b425188d9290f7b6616043d55f1b13f8bb95cf2f173f57ebd96333bc2615b56c3b92 SHA512 9ac27c5206acab0ed599e47b66a57d5c2f674075d72ebda527130745774bf95a8f3c0e2acc8d6f5938f82a695bfa3e12889fa90d5b2dda0b15410bf433858bcd
diff --git a/games-arcade/epiar/epiar-0.5-r1.ebuild b/games-arcade/epiar/epiar-0.5-r1.ebuild
index 203d8500f903..ba57731041dd 100644
--- a/games-arcade/epiar/epiar-0.5-r1.ebuild
+++ b/games-arcade/epiar/epiar-0.5-r1.ebuild
@@ -1,50 +1,66 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit flag-o-matic eutils games
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A space adventure/combat game"
 HOMEPAGE="https://sourceforge.net/projects/epiar/"
 SRC_URI="mirror://sourceforge/epiar/${P}.0-src.zip"
+S="${WORKDIR}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[png]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-image[png]
+"
+DEPEND="
+	${RDEPEND}
 	x11-libs/libX11
 	virtual/opengl
-	app-arch/unzip"
+"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+PATCHES=(
+	"${FILESDIR}"/${P}-paths.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-Makefile.linux.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-unsilence-build.patch
+	"${FILESDIR}"/${P}-respect-CC.patch
+)
 
 src_prepare() {
+	default
+
+	append-cflags -fcommon
+
 	sed -i \
-		-e "/^CFLAGS/s:-pg -g:${CFLAGS} ${LDFLAGS}:" \
+		-e "/^CFLAGS/s:-pg -g:${CFLAGS} ${CPPFLAGS} ${LDFLAGS}:" \
 		Makefile.linux || die
-	epatch \
-		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-Makefile.linux.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+
 	sed -i \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \
+		-e "s:GENTOO_DATADIR:/usr/share/${PN}/:" \
 		src/main.c || die
 }
 
 src_compile() {
-	emake -f Makefile.linux
+	emake \
+		-j1 \
+		-f Makefile.linux \
+		CC="$(tc-getCC)"
 }
 
 src_install() {
-	dogamesbin epiar
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin epiar
+
+	insinto /usr/share/${PN}
 	doins -r missions *.eaf
-	keepdir "${GAMES_DATADIR}"/${PN}/plugins
+
+	keepdir /usr/share/${PN}/plugins
 	dodoc AUTHORS ChangeLog README
-	prepgamesdirs
 }
diff --git a/games-arcade/epiar/epiar-0.5.1.ebuild b/games-arcade/epiar/epiar-0.5.1.ebuild
new file mode 100644
index 000000000000..83ff1fd13f13
--- /dev/null
+++ b/games-arcade/epiar/epiar-0.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+inherit autotools lua-single
+
+DESCRIPTION="A space adventure/combat game"
+HOMEPAGE="https://epiar.net/"
+SRC_URI="https://github.com/cthielen/Epiar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-games/physfs
+	dev-libs/libxml2
+	media-libs/ftgl
+	media-libs/libsdl[video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	${LUA_DEPS}
+"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libX11
+	virtual/opengl
+"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.1-unbundle-lua5.1.patch
+	"${FILESDIR}"/${PN}-0.5.1-fix-bashisms.patch
+)
+
+src_prepare() {
+	default
+
+	# Remove bundled Lua 5.1
+	rm -rf source/lua || die
+
+	eautoreconf
+}
diff --git a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
index 3086bd13ef9a..baf89abc3f9a 100644
--- a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
+++ b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
@@ -1,5 +1,5 @@
---- Makefile.linux.old	2007-04-05 16:42:30 +0000
-+++ Makefile.linux	2007-04-05 16:42:47 +0000
+--- a/Makefile.linux
++++ b/Makefile.linux
 @@ -24,7 +24,7 @@
  	@echo Building Epiar 0.5.0 ...
  	@$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
diff --git a/games-arcade/epiar/files/epiar-0.5-gcc41.patch b/games-arcade/epiar/files/epiar-0.5-gcc41.patch
index 65f08b2691d1..7bc0e28d99cf 100644
--- a/games-arcade/epiar/files/epiar-0.5-gcc41.patch
+++ b/games-arcade/epiar/files/epiar-0.5-gcc41.patch
@@ -1,5 +1,5 @@
---- src/game/game.h.old	2006-04-23 22:13:36.000000000 +0200
-+++ src/game/game.h	2006-04-23 22:13:50.000000000 +0200
+--- a/src/game/game.h
++++ b/src/game/game.h
 @@ -2,7 +2,6 @@
  #include "includes.h"
  
diff --git a/games-arcade/epiar/files/epiar-0.5-paths.patch b/games-arcade/epiar/files/epiar-0.5-paths.patch
index 41266c7272b1..0401a029e03a 100644
--- a/games-arcade/epiar/files/epiar-0.5-paths.patch
+++ b/games-arcade/epiar/files/epiar-0.5-paths.patch
@@ -1,5 +1,5 @@
---- src/input/input.c
-+++ src/input/input.c
+--- a/src/input/input.c
++++ b/src/input/input.c
 @@ -240,7 +240,10 @@
  *
  ******************************************************************************/
@@ -35,8 +35,8 @@
  	if (fp == NULL) {
  		fprintf(stdout, "Could not create '~/.epiar-input.ecf' to save keybindings\n");
  		return;
---- src/main.c
-+++ src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -16,7 +16,7 @@
  unsigned char view_mode = 0;
  int ship_to_follow = 0;
@@ -55,14 +55,14 @@
  	init(desired_bpp);
  
  	menu();
---- src/main.h
-+++ src/main.h
+--- a/src/main.h
++++ b/src/main.h
 @@ -1,2 +1,2 @@
  extern char epiar_version[6];
 -extern char *game_path;
 +extern const char * const game_path;
---- src/system/init.c
-+++ src/system/init.c
+--- a/src/system/init.c
++++ b/src/system/init.c
 @@ -89,9 +89,6 @@
  		main_eaf = NULL;
  	}
@@ -73,8 +73,8 @@
  
  	if (average_loop_time == 0) average_loop_time = 18; /* in case they quit on menu */
  #ifndef NDEBUG
---- src/system/path.c
-+++ src/system/path.c
+--- a/src/system/path.c
++++ b/src/system/path.c
 @@ -45,7 +45,7 @@
  }
  #endif
diff --git a/games-arcade/epiar/files/epiar-0.5-respect-CC.patch b/games-arcade/epiar/files/epiar-0.5-respect-CC.patch
new file mode 100644
index 000000000000..cf2d1d866f95
--- /dev/null
+++ b/games-arcade/epiar/files/epiar-0.5-respect-CC.patch
@@ -0,0 +1,37 @@
+From 74b0233e06365262ca6fc9bde1cfb70051acb83c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Apr 2021 23:38:53 +0000
+Subject: [PATCH 2/2] respect CC
+
+---
+ Makefile.linux | 2 +-
+ tools/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.linux b/Makefile.linux
+index 903e392..aad4b49 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -18,7 +18,7 @@ timer.o target.o zoom.o r_ships.o warship.o maneuvers.o gate_defender.o
+ 
+ PLUGIN_OBJS=
+ 
+-CC=cc
++CC?=cc
+ 
+ default: $(OBJS)
+ 	echo Building Epiar 0.5.0 ...
+diff --git a/tools/Makefile b/tools/Makefile
+index 8491658..a3f940d 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -1,5 +1,5 @@
+ default:
+-	gcc -Wall main.c -o eaf_util
++	$(CC) -Wall main.c -o eaf_util
+ 
+ clean:
+ 	rm -rf eaf_util
+-- 
+2.31.1
+
diff --git a/games-arcade/epiar/files/epiar-0.5-underlink.patch b/games-arcade/epiar/files/epiar-0.5-underlink.patch
index 13146cb68b27..fb4669be90cb 100644
--- a/games-arcade/epiar/files/epiar-0.5-underlink.patch
+++ b/games-arcade/epiar/files/epiar-0.5-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.linux.old	2011-06-22 15:15:50.000000000 +0200
-+++ Makefile.linux	2011-06-22 15:17:01.000000000 +0200
+--- a/Makefile.linux
++++ b/Makefile.linux
 @@ -1,6 +1,6 @@
  CFLAGS=-W -Wall `sdl-config --cflags` -Isrc/ -DLINUX -DDEVEL -export-dynamic -I/usr/include/SDL -I/usr/local/include/SDL -DBLIT_METHOD_2 -DNAUDIO -O2 -march=pentium4 -pipe -mfpmath=sse -ggdb -Wl,-O1 -Wl,--as-needed
  
diff --git a/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch b/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch
new file mode 100644
index 000000000000..20a6d6755c8a
--- /dev/null
+++ b/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch
@@ -0,0 +1,445 @@
+From 5cc36cce65329d946140feb78f17fc3c91cc7496 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Apr 2021 23:38:27 +0000
+Subject: [PATCH 1/2] unsilence build
+
+---
+ Makefile       |  20 ++---
+ Makefile.linux | 218 ++++++++++++++++++++++++-------------------------
+ 2 files changed, 119 insertions(+), 119 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d0aa7a8..f2c4641 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,13 @@
+ default:
+-	@echo "To build Epiar, please type the command that corresponds to your system:"
+-	@echo ""
+-	@echo "Linux   - make -f Makefile.linux"
+-	@echo "FreeBSD - make -f Makefile.freebsd"
+-	@echo "Windows - Documentation not available yet"
++	echo "To build Epiar, please type the command that corresponds to your system:"
++	echo ""
++	echo "Linux   - make -f Makefile.linux"
++	echo "FreeBSD - make -f Makefile.freebsd"
++	echo "Windows - Documentation not available yet"
+ 
+ clean:
+-	@echo "Please specify your system:"
+-	@echo ""
+-	@echo "Linux   - make -f Makefile.linux clean"
+-	@echo "FreeBSD - make -f Makefile.freebsd clean"
+-	@echo "Windows - Documentation not available yet"
++	echo "Please specify your system:"
++	echo ""
++	echo "Linux   - make -f Makefile.linux clean"
++	echo "FreeBSD - make -f Makefile.freebsd clean"
++	echo "Windows - Documentation not available yet"
+diff --git a/Makefile.linux b/Makefile.linux
+index 40ae1ff..903e392 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -21,290 +21,290 @@ PLUGIN_OBJS=
+ CC=cc
+ 
+ default: $(OBJS)
+-	@echo Building Epiar 0.5.0 ...
+-	@$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
+-	@echo Building plugins ...
+-	@$(MAKE) -f Makefile.linux plugin
+-	@echo Epiar 0.5.0 build complete.
+-	@echo
+-	@echo Type './epiar' to play.
++	echo Building Epiar 0.5.0 ...
++	$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
++	echo Building plugins ...
++	$(MAKE) -f Makefile.linux plugin
++	echo Epiar 0.5.0 build complete.
++	echo
++	echo Type './epiar' to play.
+ 
+ static:  $(OBJS)
+-	@echo Building Epiar 0.5.0 and linking statically ...
+-	@$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS)
+-	@echo Building plugins ...
+-	@$(MAKE) plugin
+-	@echo Epiar 0.5.0 build complete.
+-	@echo
+-	@echo Type './epiar' to play.
++	echo Building Epiar 0.5.0 and linking statically ...
++	$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS)
++	echo Building plugins ...
++	$(MAKE) plugin
++	echo Epiar 0.5.0 build complete.
++	echo
++	echo Type './epiar' to play.
+ 
+ clean:
+-	@rm -f $(OBJS)
+-	@rm -f plugins/*.so
+-	@rm -f *~
+-	@rm -f src/*~
+-	@rm -f src/system/*~
+-	@rm -f src/system/video/*~
+-	@rm -f src/audio/*~
+-	@rm -f epiar
++	rm -f $(OBJS)
++	rm -f plugins/*.so
++	rm -f *~
++	rm -f src/*~
++	rm -f src/system/*~
++	rm -f src/system/video/*~
++	rm -f src/audio/*~
++	rm -f epiar
+ 
+ main.o: src/main.c
+-	@$(CC) $(CFLAGS) -c src/main.c
++	$(CC) $(CFLAGS) -c src/main.c
+ 
+ init.o: src/system/init.c
+-	@$(CC) $(CFLAGS) -c src/system/init.c
++	$(CC) $(CFLAGS) -c src/system/init.c
+ 
+ video.o: src/system/video/video.c
+-	@$(CC) $(CFLAGS) -c src/system/video/video.c
++	$(CC) $(CFLAGS) -c src/system/video/video.c
+ 
+ backbuffer.o: src/system/video/backbuffer.c
+-	@$(CC) $(CFLAGS) -c src/system/video/backbuffer.c
++	$(CC) $(CFLAGS) -c src/system/video/backbuffer.c
+ 
+ debug.o: src/system/debug.c
+-	@$(CC) $(CFLAGS) -c src/system/debug.c
++	$(CC) $(CFLAGS) -c src/system/debug.c
+ 
+ audio.o: src/audio/audio.c
+-	@$(CC) $(CFLAGS) -c src/audio/audio.c
++	$(CC) $(CFLAGS) -c src/audio/audio.c
+ 
+ linux_video.o: src/osdep/linux/linux_video.c
+-	@$(CC) $(CFLAGS) -c src/osdep/linux/linux_video.c
++	$(CC) $(CFLAGS) -c src/osdep/linux/linux_video.c
+ 
+ sprite.o: src/sprite/sprite.c
+-	@$(CC) $(CFLAGS) -c src/sprite/sprite.c
++	$(CC) $(CFLAGS) -c src/sprite/sprite.c
+ 
+ menu.o: src/menu/menu.c
+-	@$(CC) $(CFLAGS) -c src/menu/menu.c
++	$(CC) $(CFLAGS) -c src/menu/menu.c
+ 
+ game.o: src/game/game.c
+-	@$(CC) $(CFLAGS) -c src/game/game.c
++	$(CC) $(CFLAGS) -c src/game/game.c
+ 
+ update.o: src/game/update.c
+-	@$(CC) $(CFLAGS) -c src/game/update.c
++	$(CC) $(CFLAGS) -c src/game/update.c
+ 
+ input.o: src/input/input.c
+-	@$(CC) $(CFLAGS) -c src/input/input.c
++	$(CC) $(CFLAGS) -c src/input/input.c
+ 
+ rander.o: src/system/rander.c
+-	@$(CC) $(CFLAGS) -c src/system/rander.c
++	$(CC) $(CFLAGS) -c src/system/rander.c
+ 
+ planet.o: src/sprite/planet.c src/sprite/planet.h
+-	@$(CC) $(CFLAGS) -c src/sprite/planet.c
++	$(CC) $(CFLAGS) -c src/sprite/planet.c
+ 
+ fire.o: src/sprite/fire.c src/sprite/fire.h
+-	@$(CC) $(CFLAGS) -c src/sprite/fire.c
++	$(CC) $(CFLAGS) -c src/sprite/fire.c
+ 
+ ai.o: src/ai/ai.c src/ai/ai.h
+-	@$(CC) $(CFLAGS) -c src/ai/ai.c
++	$(CC) $(CFLAGS) -c src/ai/ai.c
+ 
+ linux_misc.o: src/osdep/linux/linux_misc.c src/osdep/linux/linux_misc.h
+-	@$(CC) $(CFLAGS) -c src/osdep/linux/linux_misc.c
++	$(CC) $(CFLAGS) -c src/osdep/linux/linux_misc.c
+ 
+ flare.o: src/sprite/flare.c src/sprite/flare.h
+-	@$(CC) $(CFLAGS) -c src/sprite/flare.c
++	$(CC) $(CFLAGS) -c src/sprite/flare.c
+ 
+ particle.o: src/sprite/particle.c src/sprite/particle.h
+-	@$(CC) $(CFLAGS) -c src/sprite/particle.c
++	$(CC) $(CFLAGS) -c src/sprite/particle.c
+ 
+ music.o: src/audio/music.c src/audio/music.h
+-	@$(CC) $(CFLAGS) -c src/audio/music.c
++	$(CC) $(CFLAGS) -c src/audio/music.c
+ 
+ hud.o: src/hud/hud.c src/hud/hud.h
+-	@$(CC) $(CFLAGS) -c src/hud/hud.c
++	$(CC) $(CFLAGS) -c src/hud/hud.c
+ 
+ afont_base.o: src/system/afont_base.c src/system/afont.h
+-	@$(CC) $(CFLAGS) -c src/system/afont_base.c
++	$(CC) $(CFLAGS) -c src/system/afont_base.c
+ 
+ afont_sdl.o: src/system/afont_sdl.c src/system/afont_sdl.h
+-	@$(CC) $(CFLAGS) -c src/system/afont_sdl.c
++	$(CC) $(CFLAGS) -c src/system/afont_sdl.c
+ 
+ trig.o: src/system/trig.c src/system/trig.h
+-	@$(CC) $(CFLAGS) -c src/system/trig.c
++	$(CC) $(CFLAGS) -c src/system/trig.c
+ 
+ playlist.o: src/audio/playlist.c src/audio/playlist.h
+-	@$(CC) $(CFLAGS) -c src/audio/playlist.c
++	$(CC) $(CFLAGS) -c src/audio/playlist.c
+ 
+ options.o: src/menu/options.c src/menu/options.h
+-	@$(CC) $(CFLAGS) -c src/menu/options.c
++	$(CC) $(CFLAGS) -c src/menu/options.c
+ 
+ save.o: src/system/save.c src/system/save.h
+-	@$(CC) $(CFLAGS) -c src/system/save.c
++	$(CC) $(CFLAGS) -c src/system/save.c
+ 
+ land.o: src/land/land.c src/land/land.h
+-	@$(CC) $(CFLAGS) -c src/land/land.c
++	$(CC) $(CFLAGS) -c src/land/land.c
+ 
+ land_dlg.o: src/land/land_dlg.c src/land/land_dlg.h
+-	@$(CC) $(CFLAGS) -c src/land/land_dlg.c
++	$(CC) $(CFLAGS) -c src/land/land_dlg.c
+ 
+ math.o: src/system/math.c src/system/math.h
+-	@$(CC) $(CFLAGS) -c src/system/math.c
++	$(CC) $(CFLAGS) -c src/system/math.c
+ 
+ status.o: src/menu/status.c src/menu/status.h
+-	@$(CC) $(CFLAGS) -c src/menu/status.c
++	$(CC) $(CFLAGS) -c src/menu/status.c
+ 
+ shipyard.o: src/land/shipyard.c src/land/shipyard.h
+-	@$(CC) $(CFLAGS) -c src/land/shipyard.c
++	$(CC) $(CFLAGS) -c src/land/shipyard.c
+ 
+ gui_commdlg.o: src/gui/gui_commdlg.c src/gui/gui_commdlg.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_commdlg.c
++	$(CC) $(CFLAGS) -c src/gui/gui_commdlg.c
+ 
+ navigation.o: src/navigation/navigation.c src/navigation/navigation.h
+-	@$(CC) $(CFLAGS) -c src/navigation/navigation.c
++	$(CC) $(CFLAGS) -c src/navigation/navigation.c
+ 
+ gate.o: src/sprite/gate.c src/sprite/gate.h
+-	@$(CC) $(CFLAGS) -c src/sprite/gate.c
++	$(CC) $(CFLAGS) -c src/sprite/gate.c
+ 
+ comm.o: src/comm/comm.c src/comm/comm.h
+-	@$(CC) $(CFLAGS) -c src/comm/comm.c
++	$(CC) $(CFLAGS) -c src/comm/comm.c
+ 
+ plugin.o: src/system/plugin.c src/system/plugin.h
+-	@$(CC) $(CFLAGS) -c src/system/plugin.c
++	$(CC) $(CFLAGS) -c src/system/plugin.c
+ 
+ path.o: src/system/path.c src/system/path.h
+-	@$(CC) $(CFLAGS) -c src/system/path.c
++	$(CC) $(CFLAGS) -c src/system/path.c
+ 
+ tutorial.o: src/tutorial/tutorial.c src/tutorial/tutorial.h
+-	@$(CC) $(CFLAGS) -c src/tutorial/tutorial.c
++	$(CC) $(CFLAGS) -c src/tutorial/tutorial.c
+ 
+ defender.o: src/ai/defender.c src/ai/defender.h
+-	@$(CC) $(CFLAGS) -c src/ai/defender.c
++	$(CC) $(CFLAGS) -c src/ai/defender.c
+ 
+ missions.o: src/missions/missions.c src/missions/missions.h
+-	@$(CC) $(CFLAGS) -c src/missions/missions.c
++	$(CC) $(CFLAGS) -c src/missions/missions.c
+ 
+ trader.o: src/ai/trader.c src/ai/trader.h
+-	@$(CC) $(CFLAGS) -c src/ai/trader.c
++	$(CC) $(CFLAGS) -c src/ai/trader.c
+ 
+ explorer.o: src/ai/explorer.c src/ai/explorer.h
+-	@$(CC) $(CFLAGS) -c src/ai/explorer.c
++	$(CC) $(CFLAGS) -c src/ai/explorer.c
+ 
+ alliances.o: src/alliances/alliances.c src/alliances/alliances.h
+-	@$(CC) $(CFLAGS) -c src/alliances/alliances.c
++	$(CC) $(CFLAGS) -c src/alliances/alliances.c
+ 
+ summary.o: src/land/summary.c src/land/summary.h
+-	@$(CC) $(CFLAGS) -c src/land/summary.c
++	$(CC) $(CFLAGS) -c src/land/summary.c
+ 
+ employment.o: src/land/employment.c src/land/employment.h
+-	@$(CC) $(CFLAGS) -c src/land/employment.c
++	$(CC) $(CFLAGS) -c src/land/employment.c
+ 
+ bar.o: src/land/bar.c src/land/bar.h
+-	@$(CC) $(CFLAGS) -c src/land/bar.c
++	$(CC) $(CFLAGS) -c src/land/bar.c
+ 
+ track.o: src/racing/track.c src/racing/track.h
+-	@$(CC) $(CFLAGS) -c src/racing/track.c
++	$(CC) $(CFLAGS) -c src/racing/track.c
+ 
+ model.o: src/sprite/model.c src/sprite/model.h
+-	@$(CC) $(CFLAGS) -c src/sprite/model.c
++	$(CC) $(CFLAGS) -c src/sprite/model.c
+ 
+ force.o: src/force/force.c src/force/force.h
+-	@$(CC) $(CFLAGS) -c src/force/force.c
++	$(CC) $(CFLAGS) -c src/force/force.c
+ 
+ weapon.o: src/sprite/weapon.c src/sprite/weapon.h
+-	@$(CC) $(CFLAGS) -c src/sprite/weapon.c
++	$(CC) $(CFLAGS) -c src/sprite/weapon.c
+ 
+ asteroid.o: src/asteroid/asteroid.c src/asteroid/asteroid.h
+-	@$(CC) $(CFLAGS) -c src/asteroid/asteroid.c
++	$(CC) $(CFLAGS) -c src/asteroid/asteroid.c
+ 
+ network.o: src/network/network.c src/network/network.h
+-	@$(CC) $(CFLAGS) -c src/network/network.c
++	$(CC) $(CFLAGS) -c src/network/network.c
+ 
+ chunk.o: src/sprite/chunk.c src/sprite/chunk.h
+-	@$(CC) $(CFLAGS) -c src/sprite/chunk.c
++	$(CC) $(CFLAGS) -c src/sprite/chunk.c
+ 
+ gui_btab.o: src/gui/gui_btab.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_btab.c
++	$(CC) $(CFLAGS) -c src/gui/gui_btab.c
+ 
+ gui_button.o: src/gui/gui_button.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_button.c
++	$(CC) $(CFLAGS) -c src/gui/gui_button.c
+ 
+ gui.o: src/gui/gui.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui.c
++	$(CC) $(CFLAGS) -c src/gui/gui.c
+ 
+ gui_checkbox.o: src/gui/gui_checkbox.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_checkbox.c
++	$(CC) $(CFLAGS) -c src/gui/gui_checkbox.c
+ 
+ gui_commondlg.o: src/gui/gui_commondlg.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_commondlg.c
++	$(CC) $(CFLAGS) -c src/gui/gui_commondlg.c
+ 
+ gui_frame.o: src/gui/gui_frame.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_frame.c
++	$(CC) $(CFLAGS) -c src/gui/gui_frame.c
+ 
+ gui_image.o: src/gui/gui_image.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_image.c
++	$(CC) $(CFLAGS) -c src/gui/gui_image.c
+ 
+ gui_keybox.o: src/gui/gui_keybox.c
+-	@$(CC) $(CFLAGS) -c src/gui/gui_keybox.c
++	$(CC) $(CFLAGS) -c src/gui/gui_keybox.c
+ 
+ gui_label.o: src/gui/gui_label.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_label.c
++	$(CC) $(CFLAGS) -c src/gui/gui_label.c
+ 
+ gui_scrollbar.o: src/gui/gui_scrollbar.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_scrollbar.c
++	$(CC) $(CFLAGS) -c src/gui/gui_scrollbar.c
+ 
+ gui_session.o: src/gui/gui_session.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_session.c
++	$(CC) $(CFLAGS) -c src/gui/gui_session.c
+ 
+ gui_tab.o: src/gui/gui_tab.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_tab.c
++	$(CC) $(CFLAGS) -c src/gui/gui_tab.c
+ 
+ gui_textbox.o: src/gui/gui_textbox.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_textbox.c
++	$(CC) $(CFLAGS) -c src/gui/gui_textbox.c
+ 
+ gui_text_entry.o: src/gui/gui_text_entry.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_text_entry.c
++	$(CC) $(CFLAGS) -c src/gui/gui_text_entry.c
+ 
+ gui_window.o: src/gui/gui_window.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_window.c
++	$(CC) $(CFLAGS) -c src/gui/gui_window.c
+ 
+ gui_listbox.o: src/gui/gui_listbox.c src/gui/gui.h
+-	@$(CC) $(CFLAGS) -c src/gui/gui_listbox.c
++	$(CC) $(CFLAGS) -c src/gui/gui_listbox.c
+ 
+ net_sprite.o: src/network/net_sprite.c
+-	@$(CC) $(CFLAGS) -c src/network/net_sprite.c
++	$(CC) $(CFLAGS) -c src/network/net_sprite.c
+ 
+ upgrade.o: src/sprite/upgrade.c
+-	@$(CC) $(CFLAGS) -c src/sprite/upgrade.c
++	$(CC) $(CFLAGS) -c src/sprite/upgrade.c
+ 
+ eaf.o: src/system/eaf.c src/system/eaf.h
+-	@$(CC) $(CFLAGS) -c src/system/eaf.c
++	$(CC) $(CFLAGS) -c src/system/eaf.c
+ 
+ scenario.o: src/game/scenario.c src/game/scenario.h
+-	@$(CC) $(CFLAGS) -c src/game/scenario.c
++	$(CC) $(CFLAGS) -c src/game/scenario.c
+ 
+ pirate.o: src/ai/pirate.c src/ai/pirate.h
+-	@$(CC) $(CFLAGS) -c src/ai/pirate.c
++	$(CC) $(CFLAGS) -c src/ai/pirate.c
+ 
+ outfit.o: src/outfit/outfit.c src/outfit/outfit.h
+-	@$(CC) $(CFLAGS) -c src/outfit/outfit.c
++	$(CC) $(CFLAGS) -c src/outfit/outfit.c
+ 
+ esf.o: src/system/esf.c src/system/esf.h
+-	@$(CC) $(CFLAGS) -c src/system/esf.c
++	$(CC) $(CFLAGS) -c src/system/esf.c
+ 
+ timer.o: src/system/timer.c src/system/timer.h
+-	@$(CC) $(CFLAGS) -c src/system/timer.c
++	$(CC) $(CFLAGS) -c src/system/timer.c
+ 
+ font.o: src/system/font.c src/system/font.h
+-	@$(CC) $(CFLAGS) -c src/system/font.c
++	$(CC) $(CFLAGS) -c src/system/font.c
+ 
+ target.o: src/sprite/target.c src/sprite/target.h
+-	@$(CC) $(CFLAGS) -c src/sprite/target.c
++	$(CC) $(CFLAGS) -c src/sprite/target.c
+ 
+ zoom.o: src/system/video/zoom.c src/system/video/zoom.h
+-	@$(CC) $(CFLAGS) -c src/system/video/zoom.c
++	$(CC) $(CFLAGS) -c src/system/video/zoom.c
+ 
+ r_ships.o: src/sprite/r_ships.c src/sprite/r_ships.h
+-	@$(CC) $(CFLAGS) -c src/sprite/r_ships.c
++	$(CC) $(CFLAGS) -c src/sprite/r_ships.c
+ 
+ warship.o: src/ai/warship.c src/ai/warship.h
+-	@$(CC) $(CFLAGS) -c src/ai/warship.c
++	$(CC) $(CFLAGS) -c src/ai/warship.c
+ 
+ gate_defender.o: src/ai/gate_defender.c src/ai/gate_defender.h
+-	@$(CC) $(CFLAGS) -c src/ai/gate_defender.c
++	$(CC) $(CFLAGS) -c src/ai/gate_defender.c
+ 
+ maneuvers.o: src/ai/maneuvers.c src/ai/maneuvers.h
+-	@$(CC) $(CFLAGS) -c src/ai/maneuvers.c
++	$(CC) $(CFLAGS) -c src/ai/maneuvers.c
+ 
+ plugin: $(PLUGIN_OBJS)
+-	@echo Plugins built.
++	echo Plugins built.
+ 
+ plugins/radar.so: src/plugins/radar.c
+-	@$(CC) $(CFLAGS) $(OBJS) -shared src/plugins/radar.c -o plugins/radar.so
++	$(CC) $(CFLAGS) $(OBJS) -shared src/plugins/radar.c -o plugins/radar.so
+-- 
+2.31.1
+
diff --git a/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch b/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch
new file mode 100644
index 000000000000..cc064799366a
--- /dev/null
+++ b/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch
@@ -0,0 +1,41 @@
+From 99b92a9d29f61beae05227c4f10ed54c41c02b11 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 7 Apr 2021 00:29:01 +0000
+Subject: [PATCH 2/2] Fix bashisms
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b5a70d5..4d3d598 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,13 +22,13 @@ AC_PROG_RANLIB
+ AC_LANG(C++)
+ 
+ dnl Check for a C++ compiler
+-if test "$ac_cv_prog_cxx_g" == no
++if test "$ac_cv_prog_cxx_g" = no
+ then
+ 	AC_MSG_ERROR([Cannot find a working C++ compiler])
+ fi
+ 
+ dnl Set PKG_CONFIG if necessary
+-if test "$PKG_CONFIG" == ""
++if test "$PKG_CONFIG" = ""
+ then
+ 	PKG_CONFIG=`which pkg-config`
+ fi
+@@ -71,7 +71,7 @@ AC_CHECK_LIB(physfs, PHYSFS_init, have_physfs_lib=yes)
+ if test x$have_physfs_hdr = xyes -a x$have_physfs_lib = xyes; then
+ 	enable_physfs="yes"
+ else
+-dnl if test "$ac_cv_prog_cxx_g" == no
++dnl if test "$ac_cv_prog_cxx_g" = no
+ dnl then
+ 	AC_MSG_ERROR([Could not find PhysicsFS])
+ dnl fi
+-- 
+2.31.1
+
diff --git a/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch b/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch
new file mode 100644
index 000000000000..e80615e549b6
--- /dev/null
+++ b/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch
@@ -0,0 +1,49 @@
+From 0ed05474a5ea50cc972fae620fd1580ed0026fca Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 7 Apr 2021 00:28:07 +0000
+Subject: [PATCH 1/2] Unbundle Lua 5.1 and dynamically link with system copy
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Makefile.am  | 6 ++----
+ configure.ac | 3 +++
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 334b80e..b24ad29 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CXXFLAGS = -I$(top_srcdir)/source/ -I$(top_srcdir)/source/lua/src
++AM_CXXFLAGS = -I$(top_srcdir)/source/ $(LUA_CFLAGS)
+ 
+ bin_PROGRAMS = epiar
+ 
+@@ -74,9 +74,7 @@ epiar_SOURCES = source/main.cpp \
+                 source/Utilities/trig.cpp \
+                 source/Utilities/xml.cpp
+ 
+-epiar_LDADD = source/lua/src/liblua.a
+-
+-SUBDIRS=source/lua
++epiar_LDADD = $(LUA_LIBS)
+ 
+ include resources/Animations/Makefile.am
+ include resources/audio/Makefile.am
+diff --git a/configure.ac b/configure.ac
+index 17202ae..b5a70d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,6 +99,9 @@ case "$target" in *-apple-darwin*)
+ 	LIBS="$LIBS `xml2-config --libs`"
+ esac
+ 
++dnl Check for Lua 5.1
++PKG_CHECK_MODULES([LUA], [lua5.1], [], [AC_MSG_ERROR([Could not find needed Lua 5.1])])
++
+ dnl Check for SDL
+ SDL_VERSION=1.2.10
+ 
+-- 
+2.31.1
+
diff --git a/games-arcade/epiar/metadata.xml b/games-arcade/epiar/metadata.xml
index 9a42744eb0df..af9cc9c06ba0 100644
--- a/games-arcade/epiar/metadata.xml
+++ b/games-arcade/epiar/metadata.xml
@@ -6,16 +6,17 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription>
-Epiar is a space adventure/combat game written in C with SDL 
-(Simple DirectMedia Layer). It is absolutely free (released 
-under the General Public License v2).
-In Epiar, you begin as a shuttle pilot in a galaxy generally 
-ruled by anarchy, with few stable governments and numerous 
-rebel factions. You start your adventure off doing whatever 
-you want, but generally trying to save up money for a new 
-starship, and your adventure takes off from there ...
-</longdescription>
+	Epiar is a space adventure/combat game written in C with SDL
+	(Simple DirectMedia Layer). It is absolutely free (released
+	under the General Public License v2).
+	In Epiar, you begin as a shuttle pilot in a galaxy generally
+	ruled by anarchy, with few stable governments and numerous
+	rebel factions. You start your adventure off doing whatever
+	you want, but generally trying to save up money for a new
+	starship, and your adventure takes off from there ...
+	</longdescription>
 	<upstream>
+		<remote-id type="github">cthielen/Epiar</remote-id>
 		<remote-id type="sourceforge">epiar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index c3885c46e89b..b99f66b25cb6 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,4 +1,4 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
 DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
-EBUILD funnyboat-1.5_p11-r1.ebuild 1184 BLAKE2B 5b576d7acd9d1a34a7f978b813c0244e9418b18a6948aad6471a5905895d4f87e232bedaba3f5bb3d69c2fa5d2cfe57658432aec65d17df713aaf3398d040106 SHA512 3cccd8d46fe3616d7137bf95171a2f8c7ea14ccfe28d5be18c2e01832d266e6384573e68e5d30b1897d292668e4a35bf45fa7503331ade8c9f2c1b7daaee4f3f
+EBUILD funnyboat-1.5_p11-r1.ebuild 1180 BLAKE2B af5d9632077318208b6f4ad6709dbfcf13ffff5e983d8682684ee04c2129a47fd83039626dba9b5a2d3a305bcfb553145aded3d9a5b774682af0fd81c74df609 SHA512 8112c8d29a1125a89595f0437caae7330bb9799a92366c064d9874fe6a9855178ef4599f45b304d9c10dab08187cf42381c9623365612d148b5e03242f753d87
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild
index 11596a189feb..3e2caaf00f5c 100644
--- a/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-inherit desktop eutils gnome2-utils python-single-r1 xdg
+PYTHON_COMPAT=( python3_{7,8} )
+inherit desktop gnome2-utils python-single-r1 wrapper xdg
 
 DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
 HOMEPAGE="http://funnyboat.sourceforge.net/"
@@ -16,15 +16,15 @@ SRC_URI="
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		>=dev-python/pygame-1.6.2[${PYTHON_MULTI_USEDEP}]
 	')
 "
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
diff --git a/games-arcade/gav/Manifest b/games-arcade/gav/Manifest
index 1cb2bde0a8dc..4fcd8a859b9b 100644
--- a/games-arcade/gav/Manifest
+++ b/games-arcade/gav/Manifest
@@ -8,5 +8,5 @@ DIST naive.tgz 80169 BLAKE2B c2273b0056194d50ff7499c9440c0dd45175609bcb4ccab9095
 DIST unnamed.tgz 156406 BLAKE2B db88b9863ca309b9b3236dd5940642912cd4a7fd1584b842171b65033f8c47fcc6d0eb9185d3759059f4648442b446c47c0dac21c1cb37a07850703ca04f1996 SHA512 530084b5e49e40447cb68545fb4b01f837e74efa3bfb9a110f13037a7f6c135e23f9ed49837abe918a8b393226f90a2d206e5bfd2f4e60335ebf7bc4e8341673
 DIST yisus.tgz 131021 BLAKE2B b095277fdf33968b2b5d28b2e737a465a09f34b6c570d0bdb7e3be2a0c36d8d0ae4d62d14e427a139e035343faf6b1972677fa94c4aa4b787a3ce79ab3c0a137 SHA512 2494e10998bf73c369e6591edeca4c466dfdba1901ca69d96838e0310eb36c94690b9fd6df3c0aa91e0ac611ec414acf402f532145eb795a43e15406aed4c604
 DIST yisus2.tgz 117923 BLAKE2B 57770e7326cbe203aca03d37411c8f9267e9ebbd3a104d91e5e4519eb22439066bf8ef7a5eb46476103731faf0c9726eda74351c01a5ae50c6265db49409d2e6 SHA512 a063908230e9085536322481bf511cc3f3df3997d27dd83e9f976762670e2bdbebc634c2566549fe856ddc93302422cf8676147937d2cbbcf7262e722c999f4d
-EBUILD gav-0.9.0-r1.ebuild 1443 BLAKE2B 015bb71dcecd1ba0b546afa6b846025ab4b08e39807fc50226d5ba662b18421de4710d6f87282d37f51dfc3589d65fb32e2462a66ec60ab6a36e2a004c7c8640 SHA512 426ab815e6ecb4303cdfd6aecd17185f0ab67e89b551d64c49b6bdd48c50578c2e92d66f7e417e144356ac16d06699af9acc31c3af667d1eb46f1c8691faeced
+EBUILD gav-0.9.0-r1.ebuild 1656 BLAKE2B 030d9ecfdfadd5608b59e9dccfdc0c95157a2b7612055489e6d3a1f8813d26a5a3b2fbab2170da43f8fc39534f1ef6ff1fd561c16af3bc0714db5fbaf54a5a64 SHA512 bb1a0cf5b89eb9ab95e00ad5b5f52bcbda92c48fe9ea80c4413cbeea8ce24de42f05c44a4785b479be516c518be75f3144f9ed740394898f3eae45815a1bc50f
 MISC metadata.xml 326 BLAKE2B 8975ed6ba9c69a5ca31562e37d19841bd3e8ed53604b2d2dee7d188d510f167d8c154ae1337bf7195cdc9aca9badc3e86bf210e4fdc89016cb8b134660977845 SHA512 be67de8c13d7163c370e9f884dc50665720cd899c4f7d76859734751bf494f561a93fe344f04753180e27c0f854c4020dec2d9611f44d547c7b613aad705d9d7
diff --git a/games-arcade/gav/gav-0.9.0-r1.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild
index 06d00b3ebba1..babd49793332 100644
--- a/games-arcade/gav/gav-0.9.0-r1.ebuild
+++ b/games-arcade/gav/gav-0.9.0-r1.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 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="GPL Arcade Volleyball"
 HOMEPAGE="http://gav.sourceforge.net/"
@@ -44,12 +44,19 @@ src_prepare() {
 	# Now, move the additional themes in the proper directory
 	mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes || die
 
-	# no reason to have executable bit set on themes
+	# No reason to have executable bit set on themes
 	find themes -type f -exec chmod a-x '{}' \; || die
+
+	# Respect LD, bug #779976
+	sed -i -e 's/LD = ld/LD ?= ld/' CommonHeader || die
+	sed -i -e 's/$(LD)/& $(LDFLAGS)/' */Makefile || die
 }
 
 src_configure() {
 	tc-export CXX
+
+	# Nobody _really_ sets LD. Tell the compiler what to do instead.
+	export LD="${CXX}"
 }
 
 src_compile() {
diff --git a/games-arcade/gish-demo/Manifest b/games-arcade/gish-demo/Manifest
index 952d80898446..20153988e8df 100644
--- a/games-arcade/gish-demo/Manifest
+++ b/games-arcade/gish-demo/Manifest
@@ -1,3 +1,3 @@
 DIST gish-demo-1.6.tar.gz 12712912 BLAKE2B bb482ba341e688056a45077d6a6832e13e1a9785cbefbb7e76b7875e9df22f33f324a515ca3465bb3f4c4a34d1577b5eddf5ff7793d35556958b3f11d81f9f7f SHA512 2d6f37b8a7971ada524c75bafcbe7e92fd3dbb96677774b0295aad2553e6094027f9b43da8318f20071679412f95dd66ab9738178ffec4f853cf1845d536a0a6
-EBUILD gish-demo-1.6-r1.ebuild 853 BLAKE2B 5b61acfa8fe5adc8bd4a13399e10eed2b892a3c5a27de3eed586087aa246c30c84239e4f4f84d6d89590ccc32ee62ea32489eaba819644731ab49c35f0300ba5 SHA512 65d510e99125d1154dbe0b7377428018bbcf660070676a753f23f9f07fc94b4389ac1e2067ce24190e5b86991c307107548174964ba2d95e177284e9f955dc4d
+EBUILD gish-demo-1.6-r1.ebuild 813 BLAKE2B 9f04ad819b70834e1824352e0b162ac8984f6feaeaa77ebf4d10c727462f7f9cc0fea21a5dfe4aa9c52f0852866b611c96aee49a96d4f52eb74ed3f79a72c98b SHA512 16783402357be98ad8dae22280659dd13ba0a53a43f86568c2dcc5714bdd29c64cfeff0b0718d45919ac31c760b4726138bb21629768a273245f072b770a1c49
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
index 1116e16d52ec..3d80f29f2e3a 100644
--- a/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
+++ b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
@@ -1,37 +1,35 @@
-# 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
+EAPI=7
+
+inherit wrapper
 
 DESCRIPTION="Play as an amorphous ball of tar that rolls and squishes around"
 HOMEPAGE="http://www.chroniclogic.com/gish.htm"
 SRC_URI="http://www.chroniclogic.com/demos/gishdemo.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/gishdemo
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist strip"
-QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/gish"
+QA_PREBUILT="opt/${PN}/gish"
 
 RDEPEND="
+	>=media-libs/openal-1.6.372
 	media-libs/libsdl
 	media-libs/libvorbis
 	virtual/opengl
 	x11-libs/libX11
-	>=media-libs/openal-1.6.372
 "
-DEPEND=""
-
-S="${WORKDIR}/gishdemo"
 
 src_install() {
 	local dir=/opt/${PN}
 	local gishbin=gishdemo
 	use amd64 && gishbin=gishdemo_64
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r *
 	fperms +x "${dir}"/${gishbin}
 	make_wrapper gish ./${gishbin} "${dir}"
diff --git a/games-arcade/gnake/Manifest b/games-arcade/gnake/Manifest
index f4b8de1d2aff..ccd09add16ca 100644
--- a/games-arcade/gnake/Manifest
+++ b/games-arcade/gnake/Manifest
@@ -1,3 +1,3 @@
 DIST Gnake.0.94b.tar.gz 6656 BLAKE2B 2b230246b6dbb3ae9dcb3ed1dabf9f49c594180cb4e624e8e7cfb7c36823f64a0c60ec378773fea3fd1af5e036b8df98a3603b648e71f14a8e5523982aad5e83 SHA512 c5fb84cd8dc0a1b88f9eb6139f898515d109e2de0786284a4fa85f5efc0967ef02c2458d0e7f783d31fbd9a41e0f4114f7bd00717042ac9b2ca9ce4dc18e7fb7
-EBUILD gnake-0.94b-r1.ebuild 509 BLAKE2B 45e80e23a4b57b4a75dc48e49e999cc9c13f1681bb1cbffa92a349023d0e717310a24f365cc7aba2626875e8a05e7162093e6e75568da866a4a215eeb3ee8fa4 SHA512 ed28db8183b94fdbbd11af6b6c4e6d5c7f81ac0d273bb7088d5adef48c0439897162eff6ac6da576648c006e89485e782cd888542940dec2f6df260a95247307
+EBUILD gnake-0.94b-r1.ebuild 540 BLAKE2B eade9e05201cd0fc96a667f791e579983820b4ea622b5310ad3049b5e2678364084e0eabddeb36326ead575ca1c433e55243f3c7b4de6d621830c85cb93c8ccd SHA512 67ca7cfd9e4ae446620ab735bd5e9ab9d6778e8cc69104729bee0fcb8f767b894bbdfe6e4143e0c743095d82d64b8d59c1afab3da61d37d79f83915569c12165
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gnake/gnake-0.94b-r1.ebuild b/games-arcade/gnake/gnake-0.94b-r1.ebuild
index cb17bb2e53d9..88ed93eff406 100644
--- a/games-arcade/gnake/gnake-0.94b-r1.ebuild
+++ b/games-arcade/gnake/gnake-0.94b-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="An ncurses-based Nibbles clone"
 HOMEPAGE="http://lightless.org/gnake"
 SRC_URI="mirror://gentoo/Gnake.${PV}.tar.gz"
@@ -20,7 +22,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 
 src_compile() {
-	emake LDLIBS="$(pkg-config ncurses --libs)" gnake
+	emake LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" gnake
 }
 
 src_install() {
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 767c094d826f..e9b72df374ee 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,6 +1,6 @@
 AUX 3.36.0-drop-unnecessary-files.patch 877 BLAKE2B f9ca65d20efbf9b40220274881328584803f0395f233062d395c21ca0192399855b78ac7e7da7ee72d08a16736bd62bbc5670f6abbaa1c98500fb4f82917c66d SHA512 9435b8aa2caf1f9cd058ed5fbda629237c67cd9ff161be57947612ed093498d3060b9130e608211b174323a83ba18d528c606a50e8cc156aa394f192a1192d93
 DIST gnome-nibbles-3.36.1.tar.xz 323740 BLAKE2B d862900d6419505888bf3f416bb52af60186d6a3f7cb8fb52dc48fb94c3a1b99f80d262455aee335435cfef7c1573fa550d0f7595487757784a44d5e15192c3d SHA512 f7fd5c70a2ebd91d21bde26362777cecbb05bf352c13489596cbf4699f88bf93ee630a1420e91d5929ebaf05271a9006440060182d4aab9801a293559b3f2a77
 DIST gnome-nibbles-3.38.2.tar.xz 337680 BLAKE2B 96ca3794d72f600608b049aafe83808e917ec8e8462b19d31af36f2570e6c3fc8b3c9e85cbaa4ec9f041ecb934aa99701d13fcf232c447f5a4f51e6a98a66173 SHA512 e0146e33efa20ca48131be76a7f1738f8e3e2503a152c879e1d0d6accb091f9c4cb36c6d3009ca824bf6c4ac0ff5249b17e6423919c615992f0c4bef6dfcd601
-EBUILD gnome-nibbles-3.36.1.ebuild 979 BLAKE2B 841960fcf7184222cf24c9f85bff39a799202beada93f98895339f3556673d529c1b376a65923efa18b6ed5edbe880afc236ae0b6ad27031760d774ba6d125ad SHA512 493083217bb4ef95016392d1ba686b590bca7cc194b5bd31408f6df2285d1c92905daa1f4859982a08aa44d4c94316109ab8b64ff76f78ee6c1e4d36f5a1fac8
-EBUILD gnome-nibbles-3.38.2.ebuild 905 BLAKE2B 4fccac976f13eddbea7003f5ea7c2ef23b4236163be058f2cf9084e114b9a605dc7100e183e6b3b59c7328c37f0a10fd4aea0471b029a052f572c1102061b823 SHA512 b2e53167e0f4b65599d09efc4921419ceccfe3a510e940ba3d451412dde803cbfc01d364a83c7a4f09243a6e4a5a184dfb4a5bfee38ad4b74bfd398f1d14eab3
+EBUILD gnome-nibbles-3.36.1.ebuild 1007 BLAKE2B d74c0856895eb79a5bd249cf52d7441b716806fea21e7f826edc010d573f3eebf33837e8fcf64a505eb98d933be2415174a84e9fdf13d0bb0302a85f9b6fea77 SHA512 c5986d5c5a7e56c0d5285c798b5c191d33f3e3139cf30cf650ca4dbd235217f2372a152952dd08263c4d77fc1a6a2741cba2c21141c39d4a8bbb207386c9cf41
+EBUILD gnome-nibbles-3.38.2.ebuild 933 BLAKE2B 07330969f5ab2ae8674810902089f7825a6961f3b8560cbb857798c9e943504d78d8b848c14e34b58851ff424338f3182658963081c26cf14c4deaff2fcbfc0f SHA512 96d7b3f291615bff49a937f82971d2569044702a57c52a0dbbc4bbaf1893eb8229fad49ae9abc5adf7da52afa4ef7fe5d3aa9c48811cf199a82e1bb296c7986c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild
index 1673692ea9a1..5567f625aeda 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+VALA_MAX_API_VERSION="0.50"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild
index 9d563a8cff9a..3ede22959954 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+VALA_MAX_API_VERSION="0.50"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index d514f7b7f93a..278776b05d94 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-robots-3.36.1.tar.xz 428080 BLAKE2B 8026bcc2a58f3fd55daa2748b283f759c1c395766d2a64c857587a7a76e3ea27589fadf84628faf2a58b8e59e854b07630b36cd86275cd5f0fcaad58f6382755 SHA512 384506dac87818cfb9e8e72527a70adedcf01db91d18ac2bf8ac7dace68fc19429e3f15a4ff4b7e452595a3e9ae92201169ed30b687de6ef1b80b6d53c288125
 DIST gnome-robots-40.0.tar.xz 420024 BLAKE2B 2cac9377914a4cc12bdfe23bf73fd1c63e80aee7c70d3817ebeac2cb044c6a1a4f00a6fd40f903bea5560ef598ad74d372dda91a61e486eb17b0bd85bc6c53ca SHA512 bff0caf40976b420f564abbfaa96ae1627da89cfa19a7ff3c14c313f7bbdd1d0452452d49ca7b150493915ae7eebdd022aada673405e0794e4c3abd8f5c39b4f
 EBUILD gnome-robots-3.36.1.ebuild 738 BLAKE2B dcc2fe204e28e7bc0f2b2d6b49d1e1d7273eb7f2ac8d57f24b17630b9015c2607b15ce38e172fa8353ecc6a9502225f2da9febc6f7cf48870c3afd848c916ec9 SHA512 209fccbf998b29a8ea6dc6f7d1597f4ccd02cd0629894464841fddd85c43082003398ac1033e1e518c26807101643f09298d08bf1c7c5e1b675a7d48940ce829
-EBUILD gnome-robots-40.0.ebuild 892 BLAKE2B d59eeb9dfae7320391677e856d3755e67c6f4248e02e730d112bb95c634dfa7dde64581cca9c7478d2cee828190433e02bc47f382cb2ca031a34acc577285a46 SHA512 eb7dd93bb63117b07579e2e7240f8267d4de70919a160ccc1c7501946caabced461546e7dc5574dff3617d42d4ff0425bbe01c0593425d608b0ca14cc861d0c5
+EBUILD gnome-robots-40.0.ebuild 892 BLAKE2B 47ea4e1805e7c5d972aa7d888642fddb1e96a01571658836fd6dc304c56d7be41395769341f280f9afe176a6c3391e088a50df9a76615d9564cf2ec1d17d7d43 SHA512 8243d90f10ca2341519f0f48a7b3b965cea765439e483abd7151ab9d01a6cfb8143a873278bad5100c95bd9c863d729d85c6121b723405a6dc3323ece5908c30
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-robots/gnome-robots-40.0.ebuild b/games-arcade/gnome-robots/gnome-robots-40.0.ebuild
index 11f55208f0e7..93c8645abb65 100644
--- a/games-arcade/gnome-robots/gnome-robots-40.0.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-40.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index fdedd1526379..82405816c24e 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,5 +1,5 @@
-AUX gunocide2ex-1.0-build.patch 5419 BLAKE2B 63ad2cb0bfb48a3d5dbca05135896663f2bc4326e9d8905f140e938054d31600ad2ac7fc6c8c765fd5c90d1faade9c27574d8a848d321269102bdbb9abd71854 SHA512 92c3c2c16b7c4e57e11d79827db349cfb3df20e09c89e7daf8fc178475ea64851f6d79fd259824fe8c98fbed4901c0189ead7f76d3f3c834080369d1231f9692
-AUX gunocide2ex-1.0-glibc2.10.patch 377 BLAKE2B 63fc32459bc8e9eae71e220ee109e0ad5337f6d2714c6e1abf8ed802abf177df109d8572f05064381de65c9f436e01738b3621cbfb61301df90754f6da155b3c SHA512 66c166995981d841ce9a0ee0d6e56d5cc09c3856ccf72abeb4e42457ab6773ca1fdb0000e8be15445152b628dc8719bcb38c0fff30a9602a3592f3f2b6484ada
+AUX gunocide2ex-1.0-build.patch 3630 BLAKE2B 52a1d29ce7571a8a8f62548e2fdc7d4d55861d13d66f3bea51dd63f067433791ec7512a169d2a6112eed5fee6a6655be5384719085ead240353958de79ede646 SHA512 bd3ac13840b039f6766c68e77f331f61c94f170657f5959f0c8cd85fbe61468ef6a6cb513b70e3b1f2bfe809111e48ff13f5b7e79e066883b2066f6be9269fbc
+AUX gunocide2ex-1.0-glibc2.10.patch 381 BLAKE2B effecdcc17776e9f92db5054158e8becd895b17e283cc2f3926d1cf10f0465f65596e8a5391e4fa188d9cfaaf7ac06ba3feb31a18710f6709502306191260486 SHA512 187520144d3702c0a9e29849601b82cbe4d5d06443c6bff26a9f6f9011438a712c01194327fe0ad43bed5cf376c061f96ed6b9b114fd54b58c64bf1804e5eda8
 DIST g2ex-setup.run 30844481 BLAKE2B 3d59d14e594c1f742d8f39098baeb68c4898f6d04aceefa1b6eeaf6c31378eda492b5984394c1b833e7b47b1360889e74f4e944fbf9721ac8f3456116bd469ca SHA512 e3c861843d88c3b09fa2e579d1be4b0590c04b7b401c7d592cf6b7150fc395445056ba599c0bc6f72ba7044cfc097070751d32bb66aa790e72e2b1c45407f2b2
-EBUILD gunocide2ex-1.0.ebuild 1611 BLAKE2B cbc60159b314662c10121898f0c38c594f3439c598e8334836b93daff4c895edf2127fc47245420345f4ed908ab1bd7aa4617c98d053426770a3954b1bb0965b SHA512 0ac72868bb81f8cc5043438967fbd7ddd7496723b0e00213ecc25a0f43611f4c5303c9d8c5657b0df2d46633e60226bf845e514864fa137f9aff0c364f018939
+EBUILD gunocide2ex-1.0-r2.ebuild 1755 BLAKE2B 4e79dadaf8ac3529255e46fe40ede39d18b159ba47067978f2a42914711fba1cefa6a602b53218bc775bd4ea175862aaa1d07a51d039e86354bca6616dd60d25 SHA512 474509fc044634c28e5cf243489a116dd077de67042fe7eb0b08cb8508ee5e53aee06704354bb3d1f118c7893c6e52945f5e7dbdcdae27b97e58bb9609435b56
 MISC metadata.xml 327 BLAKE2B 78befc8fb90a335e458fc40d096a8dd59c04da0c72b039f7ad816d37693558514d77a40f9bbec5966aa611d2f323a1e12ac44b2dcefda015260e669f3e622887 SHA512 0ad645742ce134798ac8178d859ccdeedc9b060f7d5065b825ac9c9158130e7221c068264ce82e95f066294c045a9440a9aca241484115057ad3a709afad905f
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
index 9abce6c01a2b..a0ba41f50480 100644
--- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
+++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
@@ -1,6 +1,5 @@
-diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp
---- work.orig/src/cEffects.cpp	2002-01-12 16:19:00.000000000 -0500
-+++ work/src/cEffects.cpp	2009-06-10 18:14:27.000000000 -0400
+--- a/src/cEffects.cpp
++++ b/src/cEffects.cpp
 @@ -180,7 +180,6 @@
  	{
  		if(!i->update())
@@ -18,9 +17,8 @@ diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp
  		}
  	}
  
-diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp
---- work.orig/src/cFont.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cFont.cpp	2009-06-10 18:19:15.000000000 -0400
+--- a/src/cFont.cpp
++++ b/src/cFont.cpp
 @@ -62,7 +62,7 @@
  }
  
@@ -30,9 +28,8 @@ diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp
  {
  	font = TTF_OpenFont(path,size);
  	if(font==NULL)
-diff -ur work.orig/src/cFont.h work/src/cFont.h
---- work.orig/src/cFont.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cFont.h	2009-06-10 18:19:27.000000000 -0400
+--- a/src/cFont.h
++++ b/src/cFont.h
 @@ -34,7 +34,7 @@
  	static void		delInstance();
  	static bool		initttf();
@@ -42,9 +39,8 @@ diff -ur work.orig/src/cFont.h work/src/cFont.h
  	void			setcolor(int r,int g,int b);
  	void			setshader(int r,int g,int b);
  	void			print(SDL_Surface *screen,int posx,int posy,const char *fmt, ...);
-diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
---- work.orig/src/cParticleSys.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cParticleSys.cpp	2009-06-10 18:14:27.000000000 -0400
+--- a/src/cParticleSys.cpp
++++ b/src/cParticleSys.cpp
 @@ -81,9 +81,6 @@
  		if(time-p->getstarttime()>p->getlifetime())
  		{
@@ -55,9 +51,8 @@ diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
  		}
  	}
  
-diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp
---- work.orig/src/cSound.cpp	2002-01-12 16:27:34.000000000 -0500
-+++ work/src/cSound.cpp	2009-06-10 18:17:44.000000000 -0400
+--- a/src/cSound.cpp
++++ b/src/cSound.cpp
 @@ -92,7 +92,7 @@
  }
  
@@ -67,9 +62,8 @@ diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp
  {
  	if(!sound_on)
  		return true;
-diff -ur work.orig/src/cSound.h work/src/cSound.h
---- work.orig/src/cSound.h	2002-01-08 12:30:57.000000000 -0500
-+++ work/src/cSound.h	2009-06-10 18:17:50.000000000 -0400
+--- a/src/cSound.h
++++ b/src/cSound.h
 @@ -35,7 +35,7 @@
  
  	bool			init();
@@ -79,9 +73,8 @@ diff -ur work.orig/src/cSound.h work/src/cSound.h
  	void				stopogg();
  	bool			loadwav(int index,char *path);
  	void				playwav(int index);
-diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp
---- work.orig/src/cSprite.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSprite.cpp	2009-06-10 18:18:34.000000000 -0400
+--- a/src/cSprite.cpp
++++ b/src/cSprite.cpp
 @@ -29,7 +29,7 @@
  
  ///l�dt ein BMP in das image-Surface
@@ -98,9 +91,8 @@ diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp
 -}
 \ No newline at end of file
 +}
-diff -ur work.orig/src/cSprite.h work/src/cSprite.h
---- work.orig/src/cSprite.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSprite.h	2009-06-10 18:18:44.000000000 -0400
+--- a/src/cSprite.h
++++ b/src/cSprite.h
 @@ -26,7 +26,7 @@
  	cSprite();
  	~cSprite();
@@ -110,9 +102,8 @@ diff -ur work.orig/src/cSprite.h work/src/cSprite.h
  	void 	render(SDL_Surface *screen,int x,int y);
  	void 	setColorKey(int r,int g,int b);
  
-diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp
---- work.orig/src/cSpriteAnim.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSpriteAnim.cpp	2009-06-10 18:20:09.000000000 -0400
+--- a/src/cSpriteAnim.cpp
++++ b/src/cSpriteAnim.cpp
 @@ -145,7 +145,7 @@
  }
  
@@ -129,9 +120,8 @@ diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp
 -}
 \ No newline at end of file
 +}
-diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h
---- work.orig/src/cSpriteAnim.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSpriteAnim.h	2009-06-10 18:20:16.000000000 -0400
+--- a/src/cSpriteAnim.h
++++ b/src/cSpriteAnim.h
 @@ -53,7 +53,7 @@
  	cSpriteAnim();
  	~cSpriteAnim();
@@ -141,9 +131,8 @@ diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h
  	void	setColorKey(int r,int g,int b);
  	void	render(SDL_Surface *screen,cAnim *anim,int x,int y);
  	int		getMaxNum();
-diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp
---- work.orig/src/cUtil.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cUtil.cpp	2009-06-10 18:16:29.000000000 -0400
+--- a/src/cUtil.cpp
++++ b/src/cUtil.cpp
 @@ -85,7 +85,7 @@
  }
  
@@ -153,9 +142,8 @@ diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp
  {
  	FILE	*file;
  	char	buffer[512];
-diff -ur work.orig/src/cUtil.h work/src/cUtil.h
---- work.orig/src/cUtil.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cUtil.h	2009-06-10 18:16:39.000000000 -0400
+--- a/src/cUtil.h
++++ b/src/cUtil.h
 @@ -31,7 +31,7 @@
  
  	void	updatetime();
@@ -165,9 +153,8 @@ diff -ur work.orig/src/cUtil.h work/src/cUtil.h
  	void	drawpixel(SDL_Surface *screen, int x, int y,Uint8 R, Uint8 G,Uint8 B);
  	bool	collision(SDL_Rect objekt1,SDL_Rect objekt2);	
  
-diff -ur work.orig/src/mmgr.cpp work/src/mmgr.cpp
---- work.orig/src/mmgr.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/mmgr.cpp	2009-06-10 18:14:23.000000000 -0400
+--- a/src/mmgr.cpp
++++ b/src/mmgr.cpp
 @@ -59,6 +59,7 @@
  #include <time.h>
  #include <stdarg.h>
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
index 6b659c76a82d..2bfdd80f0f84 100644
--- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
+++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
@@ -1,5 +1,5 @@
---- src/mmgr.cpp
-+++ src/mmgr.cpp
+--- a/src/mmgr.cpp
++++ b/src/mmgr.cpp
 @@ -228,9 +228,9 @@
  
  static	const char	*sourceFileStripper(const char *sourceFile)
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
new file mode 100644
index 000000000000..920de2e8b41e
--- /dev/null
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop edos2unix toolchain-funcs unpacker
+
+DESCRIPTION="Fast-paced 2D shoot'em'up"
+HOMEPAGE="http://g2ex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-glibc2.10.patch
+)
+
+src_unpack() {
+	unpack_makeself
+	mkdir binary || die
+}
+
+src_prepare() {
+	default
+
+	edos2unix config.cfg
+
+	sed -i \
+		-e "s:/usr/local/games/gunocide2ex/config\.cfg:/etc/${PN}.cfg:" \
+		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:/var/games/gunocide2ex/${PN}-hscore.dat:" \
+		-e "s:memleaks.log:/dev/null:" \
+		src/*.{h,cpp} || die
+
+	sed -i \
+		-e "s:/usr/local/games:/usr/share:" \
+		src/*.{h,cpp} $(find gfx -name '*.txt') || die
+}
+
+src_compile() {
+	cd src || die
+
+	tc-export CXX
+
+	emake \
+		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \
+		$(echo *.cpp | sed 's/\.cpp/.o/g')
+
+	$(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
+}
+
+src_install() {
+	dobin src/${PN}
+	dosym ${PN} /usr/bin/g2ex
+
+	insinto /usr/share/${PN}
+	doins -r gfx sfx lvl credits arial.ttf
+
+	insinto /etc
+	newins config.cfg ${PN}.cfg
+
+	insinto /var/games/${PN}
+	newins hscore.dat ${PN}-hscore.dat
+
+	fperms 660 /var/games/${PN}/${PN}-hscore.dat
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/g2ex
+
+	dodoc history doc/MANUAL_DE
+	docinto html
+	dodoc doc/manual_de.html
+
+	newicon g2icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gunocide II EX"
+}
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
deleted file mode 100644
index c713085ac353..000000000000
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker toolchain-funcs games
-
-DESCRIPTION="fast-paced 2D shoot'em'up"
-HOMEPAGE="http://g2ex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself
-	mkdir binary || die
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
-	edos2unix config.cfg
-	sed -i \
-		-e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \
-		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:${GAMES_STATEDIR}/${PN}-hscore.dat:" \
-		-e "s:memleaks.log:/dev/null:" \
-		src/*.{h,cpp} || die
-	sed -i \
-		-e "s:/usr/local/games:${GAMES_DATADIR}:" \
-		src/*.{h,cpp} $(find gfx -name '*.txt') || die
-}
-
-src_compile() {
-	cd src
-	emake CXXFLAGS="$CXXFLAGS $(sdl-config --cflags)" $(echo *.cpp | sed 's/\.cpp/.o/g')
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
-}
-
-src_install() {
-	dogamesbin src/${PN}
-	dosym ${PN} "${GAMES_BINDIR}/g2ex"
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r gfx sfx lvl credits arial.ttf
-	insinto "${GAMES_SYSCONFDIR}"
-	newins config.cfg ${PN}.cfg
-	insinto "${GAMES_STATEDIR}"
-	newins hscore.dat ${PN}-hscore.dat
-	dodoc history doc/MANUAL_DE
-	dohtml doc/manual_de.html
-	newicon g2icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gunocide II EX"
-	prepgamesdirs
-}
diff --git a/games-arcade/jardinains/Manifest b/games-arcade/jardinains/Manifest
index ec5e4c081a20..8951d2015ad0 100644
--- a/games-arcade/jardinains/Manifest
+++ b/games-arcade/jardinains/Manifest
@@ -1,4 +1,4 @@
-AUX strings-pt.patch 8378 BLAKE2B ea79456d7e2f51b476dc13e838de3322db052c249e6c30c1c71806d62b3e99a86544530cd5cb30daa19f4b07cf8d90be62e38c747b54afc5dddceb891ffe783c SHA512 ed7b93a0aea20d164f00aed1760fbf8ec775e3e9e65262099c4c16dcec1c91dc24f6ad845da43b4dba554237e5c8a95831a206dabb9847b57addae6c298e2dc4
+AUX strings-pt.patch 8310 BLAKE2B 575c2faff1daeea851bd5f359b974c40909ece97221787145ee44337046d9f8478f0bfda8eee7956f855b82de432b0df41aeb6fb9babc750b6dcf9697ea1783f SHA512 b57d6f422757fb6edb86f21152d558d2b11bc315d60f7f5b787410f2cc626807216dfc30fd2ee7d8ccb93af68118bce04040e9a9ee5130e350a6fef5d53d0c5a
 DIST JN2_1_FREE_LIN.tar.gz 17433159 BLAKE2B de257584d5e0babc4c0304aec2451e92ec288c77e8aff68eaad63b43238126b4059dc56a1632b66b2bfd4a9f0408cf492a77c56de2521e12f630d498a751919b SHA512 ddb6e48e071b42b7871cb6396c61fdf9bfb85e9bb9f88720e8ac1b7bff499c43784de6bf3f67d3fe61bc05ed0e3f6a24f646aa6c54e387b95e744c16525978e8
-EBUILD jardinains-2.0-r1.ebuild 1624 BLAKE2B 52a73cbed121fcf66ad9ee2a5c3993a313440d9e5fa4a550f8074ee082bf4c09b7196efac1006b20f3bd043a05f2517ae6a9d2fa2236adf9058381cd428dec5c SHA512 0e89af86b9f73c2396eee0b497d9322e74cd2410a3a4f858677229d6e7785c1b683b02f628c6910f1339b199eb37434d434ab5cf82d7a7c07d2bf28e4d4715b7
+EBUILD jardinains-2.0-r2.ebuild 1598 BLAKE2B 64d1e8e705751c468b3cba514fb241ed8d24cb2fd78b0b2981d4062a37970c3942e17b32e8d3c0db2ac4750f76300640f6b78e83306eecc2be586504c2c855e7 SHA512 ee2851e0aca250af4c69fd2963e79e464f3693c4eb5de821602a7669fe5004c166849fc0cb51a91c4a9d701d3b09ccf26c0e4786dd158b917749b42cd192a4dc
 MISC metadata.xml 620 BLAKE2B d7544b15c6c62f4c3d1694e30afb4bf4a7a23402d83a594f35ab1f16a7eef3046121656ded24364b6e09dc93e98c17558e1ecc2e60e19edb6b8db6e95b2f00fd SHA512 4400b85a7b410885b2528a18cde41b35cd4a4034e5aecf2f1ad26c0300ed5d8e4bb01646d5be30f9c198d4d70b0bb9cc45bf52f7664cb9a51c3d704a56fa25b5
diff --git a/games-arcade/jardinains/files/strings-pt.patch b/games-arcade/jardinains/files/strings-pt.patch
index 246017a3f5bc..f4dfe3f5d46e 100644
--- a/games-arcade/jardinains/files/strings-pt.patch
+++ b/games-arcade/jardinains/files/strings-pt.patch
@@ -1,5 +1,5 @@
---- data/strings.xml	2006-11-11 23:45:28.000000000 +0000
-+++ data/strings.xml	2007-02-02 14:14:14.000000000 +0000
+--- a/data/strings.xml
++++ b/data/strings.xml
 @@ -35,5 +35,5 @@
  		<es>Espa�ol</es>
  		<it>Italiano</it>
diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r2.ebuild
index e98d0da5f03b..177944be5b6e 100644
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Arkanoid with Gnomes"
 HOMEPAGE="http://www.jardinains2.com"
@@ -11,20 +12,26 @@ SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
 LICENSE="jardinains"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
 RESTRICT="strip"
-QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
+QA_EXECSTACK="opt/jardinains/jardinains"
 
-DEPEND=""
-RDEPEND="sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+RDEPEND="
+	acct-group/gamestat
+	sys-libs/libstdc++-v3:5
 	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 	>=virtual/glu-9.0-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]"
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+
+dir=opt/${PN}
+QA_PREBUILT="${dir}/${PN}"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/strings-pt.patch
+)
 
 src_unpack() {
 	unpack JN2_1_FREE_LIN.tar.gz
@@ -33,30 +40,33 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	# clean Mac fork files (bug #295782)
-	find . -type f -name "._*" -exec rm -f '{}' +
-	epatch "${FILESDIR}"/strings-pt.patch
+	find . -type f -name "._*" -exec rm -f '{}' + || die
 }
 
 src_install() {
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe jardinains
-	insinto "${dir}"
-	doins -r LICENSE.txt data help
 
-	games_make_wrapper jardinains ./jardinains "${dir}" "${dir}"
+	insinto ${dir}
+	doins -r LICENSE.txt data help
 
+	make_wrapper jardinains ./jardinains "${dir}" "${dir}"
 	make_desktop_entry jardinains "Jardinains 2"
-	touch "${D}${dir}/data/prefs.xml"
-	prepgamesdirs
-	chmod g+rw "${D}${dir}/data/prefs.xml"
-	chmod -R g+rw "${D}${dir}/data/players"
+	touch "${ED}"/${dir}/data/prefs.xml || die
+
+	chmod g+rw "${ED}"/${dir}/data/prefs.xml || die
+	chmod -R g+rw "${ED}"/${dir}/data/players || die
+
+	fperms -R 660 /opt/${PN}/data
+	fowners -R root:gamestat /opt/${PN}/data
+	fperms g+s /opt/${PN}/${PN}
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "Due to the way this software is designed all user preferences for"
 	elog "graphics, audio and other in game data are shared among all users"
-	elog "of the computer. For that reason some files in the installation"
-	elog "folder are writable by any user in the games group."
+	elog "of the computer."
 }
diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest
index 75950efad11c..2173ce5e3d8c 100644
--- a/games-arcade/jazz2/Manifest
+++ b/games-arcade/jazz2/Manifest
@@ -1,3 +1,3 @@
 DIST jazz2-0.6.6.tar.gz 11030519 BLAKE2B c354ba9b20ea8fc559da66411ba6561dcc8943d2a87113f1166515cefd7c1cd4e13c5d9b257ee15f06a8016d0ff145bd8875ff195355d70f1c2a55088b85931c SHA512 ff896da1ec0ebc9968b469aeba3c44f599340550e3ad2cf590b9f63a50b64a59153632de1374a94d53a3b735dec0791f486c1f7c521ad3be96e2f69745486aad
-EBUILD jazz2-0.6.6.ebuild 1896 BLAKE2B 549e60d8bb94b72cb173737890d7d0f80b06779f6a43c3c4eb38122c111f06bd5e7e0a51c89801a98da061a60880ff219739df6c2558533384e455dd0c9a3aa0 SHA512 c56e1f471092b816332ed5488b7e58342a327bd5488c8ad4ff60bfba0dfda85e575e2cffa56ceb52937590a6606623f05a2d9a04e59b4cfd31b03944b478c7da
+EBUILD jazz2-0.6.6.ebuild 1897 BLAKE2B 224442d63f6c54ca783d88aa12f22b644ecee5f757119d6b033ac9588ea77385da21cdf2d7a8242707b64e5deccdc0ef181e53f282945ad90c47843f2abb33a7 SHA512 8dfd2d4135837640740be8d7716e0f5de9a6a92d3e5d41342f99dcf72d22a31778308b6e27dd7aedc94e5a6796aaa4fc9205e2b5d552e16e276bcdfd1253a531
 MISC metadata.xml 495 BLAKE2B 38d96adaa7df348574ca3a8f1602a2bb08ec578c21fbbffe5138b0c394d045c8cc66f40383401d8aeb372189e8dc55a2290b7951063554ed68d88db413ec3fe4 SHA512 a851ade899d6e3b6f2983246cd4771cf3b05792f9a3acab18edff3f90839a05718491e9870ab917f30dfbcd7b739f753fc1294a52b3aa25c20f1d2f415a85aef
diff --git a/games-arcade/jazz2/jazz2-0.6.6.ebuild b/games-arcade/jazz2/jazz2-0.6.6.ebuild
index 14bcbfd15620..3bf8b603eeeb 100644
--- a/games-arcade/jazz2/jazz2-0.6.6.ebuild
+++ b/games-arcade/jazz2/jazz2-0.6.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop dotnet eutils
+inherit desktop dotnet wrapper
 
 DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2"
 HOMEPAGE="http://deat.tk/jazz2/"
diff --git a/games-arcade/jumpnbump/Manifest b/games-arcade/jumpnbump/Manifest
index 2abb46522183..81acdf839344 100644
--- a/games-arcade/jumpnbump/Manifest
+++ b/games-arcade/jumpnbump/Manifest
@@ -1,6 +1,3 @@
-DIST jumpnbump-1.50-autotool.patch.bz2 94692 BLAKE2B 40fa60260426cc1461e3e31d220a8f7261c7ad9e079fb17011fff72dc7ad2d52f66fb040263502d6082f3609bda0c783dd5c8b6a1d226d4fa22a1f77e6bfe5c4 SHA512 3749f3bda969d9ab2225019d8a6333d23402c8e284c3278aad23f76d5436326fed1efcae28a8922f814e0cf8417ea20fc51abb34f70bd6d37afca803475214fa
-DIST jumpnbump-1.50.tar.gz 397208 BLAKE2B f62a30723d8a08976ba06b1941d62544a764b4d5cbce6b076d0f096af099d9db35a451c413f3c490e2aff0388c92456e46a70cdc6a9404449a19dc4a77be0db3 SHA512 a343e514efa42aacd2c0fd113269ebf27418ea851dad21cecfa16a765639cc6a5de43fbdb9ad2f0282740f369b7e457a236fc3e918b486af10222c733f5c8fb0
 DIST jumpnbump-1.61.tar.xz 309072 BLAKE2B 057f597aedfcacb5c45e2980d670109c6ed1d9508a17ff467f44e10190d84d19609fded416c30512a59385a6c59221da98af90069adc993f0cc4c9332d248321 SHA512 1c5999c6d0d00770416a61803e5dac4742e23d787ba6bec3742517e3eab006efe9448e59f3e84278e224e184a8ac8444c7c766b74374761b1aec7cffdc1708c1
-EBUILD jumpnbump-1.50-r2.ebuild 1282 BLAKE2B db863041ba35be6c23b2cbf7b25b25a3f022b61330c9d928e744cdbd9f4acd16ef2bcd4b03d2b67cb1707684b43ca6a02ff843e52ff23f28868b37e41b917f33 SHA512 dfc145c876b15655efc71f522c59443e0f99411dd121be441213a2f39cf07fb26ca71ce6f4d5f0c083cc2aaa137e24c4b9a1f26df6a438bfcdd5ec0834c95be1
 EBUILD jumpnbump-1.61.ebuild 1124 BLAKE2B c3691bf61af7c6e851b5c483bcb2384e89895e3fbd2c50d0b02478fe4c4ec528e520baf22f3280d552508e778ab316fde6f621fcc1e516fdbf00f5d6ef6a36db SHA512 c84789413db6261eed2764baaa582cde21209d2bdc80de45ba593bbfe982905e4618018c467de5785a22c7f48a3eae8f6f337b11edfebbd8cf1bce37710df4c5
-MISC metadata.xml 379 BLAKE2B f436676eb0dcf671aaa81bfe8604ac79a129908abea3dfc69085847867958f4871b2db0ef1ab42cc01d5381a82ec010e8bdab28bd11a87eac10ec5641182dbab SHA512 3a387ef707eca3ed9b936353fde531be510c32f18bf31023a01158464b293111dd114d2a26287d705af229a686bac1db36754b58702879f0ed5bc1b99f47eab9
+MISC metadata.xml 324 BLAKE2B 12979731fe678963e60971d77afe89393e1766ab2e7c376fedb50ed90b70e3db27c9c6ec1d27779f915146359939a2158f6c21e96dddd026292d95e91ba82db8 SHA512 1094586deb1071a71a93ce43319f779b79af77986de1e88a3f5ae9bd992a3cad096066018986f8c5b0665e30ab37af1703c65a310c5615b64df38ba982c72f04
diff --git a/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild b/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild
deleted file mode 100644
index 476381cf4757..000000000000
--- a/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A funny multiplayer game about cute little fluffy bunnies"
-HOMEPAGE="http://www.jumpbump.mine.nu/"
-SRC_URI="
-	http://www.jumpbump.mine.nu/port/${P}.tar.gz
-	mirror://gentoo/${P}-autotool.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X fbcon kde svga tk +music"
-
-DEPEND="
-	media-libs/sdl-mixer
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-net
-	X? ( x11-libs/libXext )
-	kde? ( kde-apps/kdialog )
-	music? ( media-libs/sdl-mixer[mod] )
-"
-RDEPEND="${DEPEND}
-	tk? (
-		dev-lang/tcl:0=
-		dev-lang/tk:0=
-	)
-"
-
-src_prepare() {
-	default
-	eapply ../${P}-autotool.patch
-	rm -f configure
-	eautoreconf
-	sed -i \
-		-e "/PREFIX/ s:PREFIX.*:\"/usr/share/${PN}/jumpbump.dat\":" \
-		globals.h \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	# clean up a bit.  It leaves a dep on Xdialog but ignore that.
-	use fbcon || rm -f "${D}${GAMES_BINDIR}/jumpnbump.fbcon"
-	use kde || rm -f "${D}${GAMES_BINDIR}/jumpnbump-kdialog"
-	use svga || rm -f "${D}${GAMES_BINDIR}/jumpnbump.svgalib"
-	use tk || rm -f "${D}${GAMES_BINDIR}/jnbmenu.tcl"
-	newicon sdl/jumpnbump64.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Jump n Bump"
-}
diff --git a/games-arcade/jumpnbump/metadata.xml b/games-arcade/jumpnbump/metadata.xml
index 81218895621f..42a904172c6a 100644
--- a/games-arcade/jumpnbump/metadata.xml
+++ b/games-arcade/jumpnbump/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="gtk">Install Python-based GTK menu</flag>
-	<flag name="music">Enable playing of background music</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Install Python-based GTK menu</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
index b67e7fc1c38b..73bcbb986ebb 100644
--- a/games-arcade/methane/Manifest
+++ b/games-arcade/methane/Manifest
@@ -1,6 +1,6 @@
 AUX methane-1.5.1-fullscreen.patch 2575 BLAKE2B 070ef125fd26fbfb3103ce27b729877f85f497a4e8ab0c7fd10e75410bc70d3c96b18d24215a3e36fd01b0ce276775da9585ae1e78cd7d4c648060e53b120639 SHA512 8cf757c5fff8577ab79bc2ca9c062b8ac710704449fd1b7cbe2071bd62ff3bd39cf6c83f78f1136b8780ef4f0477677d4f866f55d4b9af67e0c5ab58b5a208ac
 AUX methane-1.5.1-gcc5.patch 2193 BLAKE2B 6377bdf4375daed5b9bf37c64ef80a1a8e01a934286c49f7330be05f290e0ca5a55b871179a08b5361fa3559463a6305910f85a8e5ee68f205656988ffffdacb SHA512 fa61ca7f68ea27fdf3c9952595a72776652810a0158eb206a7144ea9dd0df61986573722e9beb8b3a56d82ca19edc1daebdd23594d8310e7f5a89b721eb844c7
-AUX methane-1.5.1-gentoo.patch 2885 BLAKE2B b1ff8db81d35a5f99028bd0e233f325052db84fb5495d8100309625541678cea6fcb3f4e684ea272377b6f2ed3f3710590c9604f8f6f637331b73b4c8d4d38c6 SHA512 e84412cd9df8a3946f60b0fdaeb59979a5a7720c7a730ab620f2279a7c68bfc81f979b095fd4c98e9d83fb58ffba018390c082287f3ef67f7421353b2b85012a
+AUX methane-1.5.1-gentoo.patch 2663 BLAKE2B 63e289531655cfa760f8345fb530778cd2b8d4c68dc3ea59bec908fd1ad3c1dfebcd39735578706596cf8392bd67757c78ba1082fc45a50ca2aafb9c2b8dd430 SHA512 56ab2a112336ce6a73b4de5788497f5a12c2eb23e4711afad8406375a1e3b33a70d42a412bc5d6530f27f584584e01f177b951f266abdbdd16ef48e343623fde
 DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155
-EBUILD methane-1.5.1-r1.ebuild 974 BLAKE2B 129deb2f614366d5b9c08dcd87351be395c53a03f6ea2a8fd394512f21a912c24bd874c901244af5e4a2635f08dddbdac1ef1f637987966252749d100ed8ff97 SHA512 88e09680dab7dbd51b51061febbe572a7515d27606e1b55193323d2add438ed743e8710208fc027f0dc6542849a0af78ada7216ae5b33faa979f70c88f31acf1
+EBUILD methane-1.5.1-r1.ebuild 1007 BLAKE2B 6cbafc97d23676f9c730b76cb69e76d3f738db7b80583bf3099947e1fb051b1d88e06c68d9308159512908e534a72632fc4ebf582295137c92cf39b73fb988f2 SHA512 f1727b4835aadbd0d78af7f2b82d950edcd12599f622022d83d96e7b0905368b29e3896d9695ef8c4dc38be2ad42910b0c8f108a35abf4ff06f87cb71bc686c5
 MISC metadata.xml 330 BLAKE2B 29205dbe4c0acf2e057c19d5c24057eff9fd7727fee56876d2bf9705baf2613ba80c59a6bcaf80d2346629259d4287ae7697c63466aa4f053ab3105f7efad5bf SHA512 fbb2b283c78c2952bb974a7b247ad80e4d1a9c1d8af47fa13e3d48fc91c9372c09b04212c55c6b06bbc939ea55e64c42bdd6fbae7cbb60c8fa6ed60f48305960
diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
index 6d72a2ca7ed5..26a1b438c8a8 100644
--- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch
+++ b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
@@ -1,10 +1,10 @@
---- a/Makefile.old	2012-11-26 18:58:48.201837870 +0100
-+++ b/Makefile	2012-11-27 12:30:16.038998128 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,5 @@
 -METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
 -METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2  clanSound-2.2 clanMikMod-2.2`
-+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3`
-+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3  clanSound-2.3 clanMikMod-2.3`
++METHANE_FLAGS = -DENABLE_SOUND `${PKG_CONFIG} --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3`
++METHANE_LIBS = `${PKG_CONFIG} --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3  clanSound-2.3 clanMikMod-2.3`
  
  OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o
  
@@ -25,8 +25,8 @@
 +	$(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
  
  
---- a/sources/methane.cpp.old	2012-11-27 13:49:22.993003266 +0100
-+++ b/sources/methane.cpp	2012-11-27 17:37:23.051913777 +0100
+--- a/sources/methane.cpp
++++ b/sources/methane.cpp
 @@ -80,15 +80,15 @@
  				return 0;
  			}
@@ -49,8 +49,8 @@
  			}
  
  			// Set the video mode
---- a/sources/target.cpp.old	2012-11-28 21:34:32.666878913 +0100
-+++ b/sources/target.cpp	2012-11-28 21:35:16.371247221 +0100
+--- a/sources/target.cpp
++++ b/sources/target.cpp
 @@ -132,7 +132,7 @@
  	CL_GraphicContext gc = m_pWindow->get_gc();
  
diff --git a/games-arcade/methane/methane-1.5.1-r1.ebuild b/games-arcade/methane/methane-1.5.1-r1.ebuild
index d26feb258d71..7d0a032b4ccc 100644
--- a/games-arcade/methane/methane-1.5.1-r1.ebuild
+++ b/games-arcade/methane/methane-1.5.1-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=7
-inherit desktop
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Port from an old amiga game"
 HOMEPAGE="http://methane.sourceforge.net/"
@@ -11,34 +12,37 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="dev-games/clanlib:2.3[opengl,mikmod]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	# From Fedora
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-fullscreen.patch
+)
 
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-
-	# From Fedora
-	eapply "${FILESDIR}"/${P}-gcc5.patch
-	eapply "${FILESDIR}"/${P}-fullscreen.patch
-
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:/usr/share:" \
 		sources/target.cpp || die
 
+	tc-export CXX PKG_CONFIG
+
 	# fix weird parallel make issue wrt #450422
 	mkdir build || die
 }
 
 src_install() {
 	dobin methane
+
 	insinto /usr/share/${PN}
 	doins resources/*
+
 	newicon docs/puff.gif ${PN}.gif
 	make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif
 	HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt
diff --git a/games-arcade/nottetris2/Manifest b/games-arcade/nottetris2/Manifest
index 1625c882e1fd..92a8380a02e3 100644
--- a/games-arcade/nottetris2/Manifest
+++ b/games-arcade/nottetris2/Manifest
@@ -1,3 +1,3 @@
 DIST nottetris2-1.zip 2774048 BLAKE2B 2bc1edc06aeca837d39b226b5a288506a98a4a9bd2e7f884fba57c8335944689758c6cb74d2985fc8450bdba19759a177ad3036d816035770638e6520d896201 SHA512 63478640fadf91134dec86f88d6422a317b4523ececff836e40984500f2771d564012cbd587a46b300e084c3c64531f3758c648edf3d683b136c9da69924a187
-EBUILD nottetris2-1-r1.ebuild 767 BLAKE2B a37646f6baecfedc8e4d7c37ac4de2823675ed3dcd5e8cb7bc2442746392237516370d250e840bea0752c19b950a489d4984c0dab7581c98f833e8274afeaad1 SHA512 9daa3a2960766c18cc80521256eb49431efa0d3b554a25d104aa8c4368846eadb82bf91cd0413699f77a55f84c3de9aa9a1e1f65d8049e94a609ae827e268104
+EBUILD nottetris2-1-r1.ebuild 768 BLAKE2B 2dd8afe2fbf437293558876fd16c41bf2143fca0864327eccb3fabd1764be99c9cbeb5d0fe703e0ff582c2c7efc96652de97b7fc4fcbb9d43fd3d3e2e1059c87 SHA512 534614bb55fb0d9f98159425dfc1916e9d0c31ac07d91f58fe7ec7b29dd6f4adc6604e437521063e558474eba5618e4381ea9150959cff4687f13ed6188a5b57
 MISC metadata.xml 756 BLAKE2B 8afda50ed483b95a2ba5f023b97e712dfd5facb6e8b12ecc74482a5fccb97129c9b8fff9356cf55312a0c7da3c0e7cffb2d581c0a36522012a3589ed9cb6cbea SHA512 bdbf35cb4e16381e9f53e8290a43517819ab59694425068d82a5adc6ce8c798f9de9db23181875eae41852ca08ac114f82bc750b72567989c50ed5f23a64f49b
diff --git a/games-arcade/nottetris2/nottetris2-1-r1.ebuild b/games-arcade/nottetris2/nottetris2-1-r1.ebuild
index 730417cb8a3b..329cea1efb91 100644
--- a/games-arcade/nottetris2/nottetris2-1-r1.ebuild
+++ b/games-arcade/nottetris2/nottetris2-1-r1.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=6
+EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
 DESCRIPTION="The spiritual successor of the classic Tetris mixed with physics"
 HOMEPAGE="https://stabyourself.net/nottetris2/"
 SRC_URI="https://stabyourself.net/dl.php?file=nottetris2/nottetris2-linux.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="CC-BY-NC-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 LVSLOT="0.7"
-RDEPEND=">=games-engines/love-0.7.2:${LVSLOT}
+RDEPEND="
+	>=games-engines/love-0.7.2:${LVSLOT}
 	 media-libs/devil[png]
 "
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	local dir=/usr/share/love/${PN}
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	newexe "Not Tetris 2.love" ${PN}.love
 
 	newdoc "Not Readme.txt" README
diff --git a/games-arcade/openmortal/Manifest b/games-arcade/openmortal/Manifest
index 4289613553ce..93489f39e256 100644
--- a/games-arcade/openmortal/Manifest
+++ b/games-arcade/openmortal/Manifest
@@ -2,5 +2,5 @@ AUX openmortal-0.7-freetype.patch 394 BLAKE2B b9373aa4e5aa0906a614bf161a6809f136
 AUX openmortal-0.7-freetype_pkgconfig.patch 470 BLAKE2B c09d5876913205eb879bb366a233152139e3cc6c7ace4bcc1d48f4dccfcab7e7be55117205f12426c95462ff3062818c00fa067d96c758e30030761db702ecc1 SHA512 9145794e5c9b3fa30c7bedd85919ccaee852597297e4985a58ab7834ecfc5ba143f377f73bd20c5e3915c4e25ef89d8aa96eb5aace175a8c2379fbf3b6f8cf7c
 AUX openmortal-0.7-gcc41.patch 305 BLAKE2B 1f6cba83ed4af95978045404edfd6396d438ca26f5b9f0d5b159dfb37978a1f50a3a18857db82b3bf74dd74a979563d0f7949e544f4527a57237662502c4c77c SHA512 0bc8c0924a86b4e024602c67bb4136ba67e0dc9d58381a2c00f07ce02845e1d389186c4864720a16cdf828a287ca9d6488e3420512daf7e3585988b0449a930b
 DIST openmortal-0.7.tar.bz2 51197736 BLAKE2B b4744bde2a9695cc5a1323f4e258fe7cf191d7e15e086e37f476feed0ed4039c27a58ee8d0a28b00945a2ba985dc0591bcf1832f070ace6b65ae04826df7ea3b SHA512 8af0b64a3d894dfdbdddafdbdc4c853dc2bfc9b52fd507db2818e67af5ad6cdbbb45f2e42e32103e841759225b1b8c4f33ac5a8ad70e4763698c54803fb81fce
-EBUILD openmortal-0.7-r2.ebuild 856 BLAKE2B ca7468ec3757986ba86b3b5c10cc9fc71f4e804a22ca3f5b56aea1e074b48057bc9cc9e2baf37d47211e05d09f1389ca9f726f53cd1897d43ab6eb3385754500 SHA512 31e6dbee577b50d80fd5c0aee48115c2d64bfd9830eb76922ab1e6d8b884f19cee18238430269b31cb7681590ac7eb1332c70172f496a875ff11cb5a3e8df283
+EBUILD openmortal-0.7-r2.ebuild 854 BLAKE2B 2fc55698c79c4375b27417e286390501588974dcc1cb539313e3f88dd78dbcb9fe7ab2d1a461c5169b45344bdbf34b56de3386ef5d4f0e717c91147c26f43f67 SHA512 7b4541bb550f83feb4af0699cb06a2d8d92b47380f1c7b91b6fab11c733a5156b7f47032f306adfe5d1e30f498c7a8e2a1c68c6f15ae9afa34172beb8b1c48d5
 MISC metadata.xml 333 BLAKE2B d6fb63cdba371534a7ae3217ea7d659aba14bdeff1b63bcf9adcca55f0c1975fea3d88beaa695bd95b7c6675c37f049b0c97d2b7666c86acd673e1b1476c6ff3 SHA512 3cf6883bbe8b14f392d0207792ef501bd2c7fa5395a82d1606341b9f44f639879756bc90645cf7bac038ede44865afde59b1622ee0657e1980b6ec3ccd68cefd
diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
index 0153c5d051ac..6e1e3a824afa 100644
--- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r2.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
@@ -21,7 +21,7 @@ RDEPEND="media-libs/libsdl[video]
 	>=media-libs/freetype-2.4.0:2
 	dev-lang/perl
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/games-arcade/orthorobot/Manifest b/games-arcade/orthorobot/Manifest
index 1da1c708846f..0b95b1ed7b6a 100644
--- a/games-arcade/orthorobot/Manifest
+++ b/games-arcade/orthorobot/Manifest
@@ -1,4 +1,4 @@
 DIST orthorobot-0.zip 3429026 BLAKE2B d21023045cce73142f03179719591f4f0e58a3a968a1094da07611ec77cac37bcf822ddd3748699c21718e27534ee2e993a1f4cab038dd745fc94337f277a374 SHA512 cf73bfd7d136c0d408dcee80db1193c4ae1d418128b8879a67c5fbfc013ce33ffab4255c0ea2e7d2a70f22301192fb77bd5b3105d69ff511d2d5a5b99fbd0cf0
-EBUILD orthorobot-0-r1.ebuild 976 BLAKE2B 547c1be51e984ed58010fc6f7213c4b39a2a60d144cda8a16d24acb7143e933b804d212b7bc93853fc0a39c8d9f5c9fcdf794f3b62cebe973499a0180961aa29 SHA512 cf6f0cce78d66fd092dd6822f68dc989287c4994b52d2c151aad321b37ad26de682b3b742928ca3ef6c97c8c90f81b87978e5694abea5c72cc70c7d0db78bc65
-EBUILD orthorobot-0-r2.ebuild 999 BLAKE2B 92ade38750278972569870539b4c1247ef9ba70f291453a56f7ac85ab73bf4d8d6a9282e37149b54058fb3182d9b5374bbbaf83b31f3dedfb07a58b48e81953e SHA512 819b9f0a752934d2ab56a02772f0cca807f8354edf3c9f2dcc142109ab9a1ffde07b45285ba8f80a7c31fb4733f830482c4e10d666c068620ba0cadb557df0bd
+EBUILD orthorobot-0-r1.ebuild 987 BLAKE2B 60790ee5507ee87926d85eb510b4cc4d62e6f7a29a931cc74d72014fb2ab42f13a5ec9439c745255adcb61cf765576e658b9f2b737f2b128a9e1122e429285b2 SHA512 e9abbe057544327f1e91bac6c9f15d64d4ef0e51d35074c0429f8f01b1c28b5253ab5d10fb2f3671635a060e3550e37a387b39b7c88039a9b70349ffc74e8497
+EBUILD orthorobot-0-r2.ebuild 1010 BLAKE2B 5a82acc12454c857ce24ad494e5f7fdafc65f18b23de40dfd9453dabc3bf5f42c3f19d89ab256476350747ad11a95d03e0935a873920eb2bc19d3fc75283a412 SHA512 bcd7fda06b65265515752a5672f799660cbe98794b35b86bfad67846a202774199d24c1a15f86b078e3bcc8b34b4c1e1a0e11a2b6d4acc0eb8aa17e54fed2d28
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-arcade/orthorobot/orthorobot-0-r1.ebuild b/games-arcade/orthorobot/orthorobot-0-r1.ebuild
index 7d3771a8a4cf..387a153a6b68 100644
--- a/games-arcade/orthorobot/orthorobot-0-r1.ebuild
+++ b/games-arcade/orthorobot/orthorobot-0-r1.ebuild
@@ -1,39 +1,43 @@
-# 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
 
 DESCRIPTION="Perspective based puzzle game, where you flatten the view to move across gaps"
 HOMEPAGE="https://stabyourself.net/orthorobot/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="CC-BY-NC-ND-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=games-engines/love-0.8.0:0"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	default
-	#it is only one .love file (but with crappy name), so we can use asterisk
-	mv *.love "${P}.zip" || die 'mv failed'
+
+	# It is only one .love file (but with crappy name), so we can use asterisk
+	mv *.love "${P}.zip" || die "mv failed"
 	unpack "./${P}.zip"
-	rm "${P}.zip" || die 'rm failed'
+
+	rm "${P}.zip" || die "rm failed"
 }
 
 src_prepare() {
 	default
-	# fix error on quit
-	sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die 'sed failed'
+
+	# Fix error on quit
+	sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die "sed failed"
 }
 
 src_install() {
-	local dir="/usr/share/love/${PN}"
-	insinto "${dir}"
+	local dir=/usr/share/love/${PN}
+	insinto ${dir}
+
 	doins -r .
 	make_wrapper "${PN}" "love ${dir}"
 	make_desktop_entry "${PN}"
diff --git a/games-arcade/orthorobot/orthorobot-0-r2.ebuild b/games-arcade/orthorobot/orthorobot-0-r2.ebuild
index 305cf7ee67ed..1da2dac05619 100644
--- a/games-arcade/orthorobot/orthorobot-0-r2.ebuild
+++ b/games-arcade/orthorobot/orthorobot-0-r2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Perspective based puzzle game, where you flatten the view to move across gaps"
 HOMEPAGE="https://stabyourself.net/orthorobot/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="CC-BY-NC-ND-3.0"
 SLOT="0"
@@ -14,28 +16,30 @@ KEYWORDS="~amd64 ~x86"
 
 LVSLOT="0.8"
 RDEPEND="games-engines/love:${LVSLOT}"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	default
-	#it is only one .love file (but with crappy name), so we can use asterisk
-	mv *.love "${P}.zip" || die 'mv failed'
+
+	# It is only one .love file (but with crappy name), so we can use asterisk
+	mv *.love "${P}.zip" || die "mv failed"
 	unpack "./${P}.zip"
-	rm "${P}.zip" || die 'rm failed'
+
+	rm "${P}.zip" || die "rm failed"
 }
 
 src_prepare() {
 	default
-	# fix error on quit
-	sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die 'sed failed'
+	# Fix error on quit
+	sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die "sed failed"
 }
 
 src_install() {
-	local dir="/usr/share/love/${PN}"
-	insinto "${dir}"
+	local dir=/usr/share/love/${PN}
+
+	insinto ${dir}
 	doins -r .
+
 	make_wrapper "${PN}" "love-${LVSLOT} ${dir}"
 	make_desktop_entry "${PN}"
 }
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index d050d0a6a799..ab782bf1a51d 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -1,6 +1,6 @@
 AUX oshu-2.0.0-use_unpacked_osu-skin.patch 1233 BLAKE2B fb8a41b0fc8c8891e3d1dbe1cca6da320049c30a24b146612e2dcbf5490458b8c5db1ed410e9378552f4f048148b2770caf1f87ca60431b92f5d9f9b12885761 SHA512 4e5a0cfb995710c16f6acba7a02e4f0c25de9fc83b28de8c42279fe8e3dea01c33a2e22e9b43e05ab9996534710199315f36e836e24a41ea212e17b08c30e461
 DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf
 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
-EBUILD oshu-2.0.1.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
-EBUILD oshu-9999.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
+EBUILD oshu-2.0.1.ebuild 1190 BLAKE2B ec734d13c35b0016b091910d722f7e08bce57700ed160eec78e4854553422995e2c1b4aba8cb202ae9a5d6e06df428dcc8e6b5064b76faaf82877baade5b730c SHA512 6028ae2e6463f87f9b5a7eae829e958cf6c1f9052d773b2714865dbc8bfde4fa17f783f2052bb66fccf80d5b9722e9352d523ff1245217f2ebca24c14345afbd
+EBUILD oshu-9999.ebuild 1190 BLAKE2B ec734d13c35b0016b091910d722f7e08bce57700ed160eec78e4854553422995e2c1b4aba8cb202ae9a5d6e06df428dcc8e6b5064b76faaf82877baade5b730c SHA512 6028ae2e6463f87f9b5a7eae829e958cf6c1f9052d773b2714865dbc8bfde4fa17f783f2052bb66fccf80d5b9722e9352d523ff1245217f2ebca24c14345afbd
 MISC metadata.xml 453 BLAKE2B 5a476eba4e50e27ad8acd30a83b52730da9dacff8c6f1a1447b507954f861178a9df6ec15cef8411114f7566f0bc345428a5ca1f9493d2a94bf2b0050e595844 SHA512 45022b42de377cff0287a20def5de6a768773af459adc14fbcd37e71ade1aa32fec5902b5df8a40a2edc581002c24c5840c9c0a285067f1b0e1ce89459be47ce
diff --git a/games-arcade/oshu/oshu-2.0.1.ebuild b/games-arcade/oshu/oshu-2.0.1.ebuild
index f394d8081789..5ebae7bfdcd6 100644
--- a/games-arcade/oshu/oshu-2.0.1.ebuild
+++ b/games-arcade/oshu/oshu-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake xdg
 DESCRIPTION="Lightweight osu! port"
 HOMEPAGE="https://github.com/fmang/oshu"
 
-if [[ $PV = *9999 ]]; then
+if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
 	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild
index f394d8081789..5ebae7bfdcd6 100644
--- a/games-arcade/oshu/oshu-9999.ebuild
+++ b/games-arcade/oshu/oshu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake xdg
 DESCRIPTION="Lightweight osu! port"
 HOMEPAGE="https://github.com/fmang/oshu"
 
-if [[ $PV = *9999 ]]; then
+if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
 	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
diff --git a/games-arcade/pachi/Manifest b/games-arcade/pachi/Manifest
index 581f270df189..8641ab0f5290 100644
--- a/games-arcade/pachi/Manifest
+++ b/games-arcade/pachi/Manifest
@@ -1,4 +1,4 @@
-AUX 1.0-autotools.patch 1161 BLAKE2B 848b3366f103a245cdfe8c8bc2cf79e96eb7d3fd0f1d06d7e7a904cd592382e4447e9083b8395bd9a297864d429eb47abf310b736a5ddc1cae18cf233e94f67f SHA512 45f3818c4bf9a0fae123b11f3641f47be77886eb85849984b1a8fe391ae1b333ee7ac0d5ffe294ee986efe262762d995e2ff5b2786a9dc2c26123c200cfb3c57
+AUX 1.0-autotools.patch 1173 BLAKE2B 3bc58ba6dc677f2fbff28f944ecd01e41fe41df5dea2b7e8cbbb596e5ee4f797bf4720e7b4ccb7f182c0f15748b128db33127c23e54b744a6b980d79f13eb601 SHA512 478e4daf8c396d0938ce33414d37b6502cebfa16b57b099365ca9cdbda1b042871fe95392f005767c49759400c0823edc1b5bbe8b2bf96d9997cdb5df190a5a7
 DIST pachi-1.0.tar.bz2 3101484 BLAKE2B 31c15f1c0fac503abbba67c0483e60d1b12d84d7d0cb5eaebda01e0942ead1d202841942711306c800cfe8346a3e31ed10671555184d52d345464640a90d5c1c SHA512 9b09baa47ceb051d80ea621d2449afd2d9de959e707d2a1b3119ce8f0c623ebc1afb1678389c647b066fb2211f3f7eb27d713ee33514e2739ba48f9bf14c7952
-EBUILD pachi-1.0.ebuild 941 BLAKE2B 37f9fa99223c405ee3d3a8fc282421a78304b1a5a2fac5f24311ebf2493c9612f16c3baa7e02ce2674d2e6d196a73cb42c835b8ae7d74167197a782cf460a3c5 SHA512 48234f533b4cf89020a55501c9274e5af806936a75b67d61368343db5c7e05332836853897d9408bf403519ccea30837d546248952d5a509161d6ae54bca598a
+EBUILD pachi-1.0-r1.ebuild 1088 BLAKE2B 23c93592b2c603473f5a5588f93fa8da6765c515a9e95bb24fde5b51d70b418e28812471981083ef51d3a399da331e63bffbec640cff2115cd52382cdca1119e SHA512 fe799267b62024ce3800163a09de45dcb5a90c124e5eec445ff63a2909e080d1acf20d7d5be19579dfe46c5a3e896c9d1ffc0594d14211e3807f6cd15bda52dd
 MISC metadata.xml 333 BLAKE2B e14155543715b12b61b84d111606a7630315a349d0ad1ed68a4323ec50ff225f6cd9ed3a3bbc980e1246982bb25444884a1e63386c9526d31fb7b31b28f95892 SHA512 9f7e4e3994f529f9905dcf550cfb3ab0a4f0998a689a52e34d1bb2b5916273e7827937900606316cdd465e90752ab5a1bd0cf248f6288fc3d1be3f3d35982567
diff --git a/games-arcade/pachi/files/1.0-autotools.patch b/games-arcade/pachi/files/1.0-autotools.patch
index 0d0185f142f3..79e79d3a89ec 100644
--- a/games-arcade/pachi/files/1.0-autotools.patch
+++ b/games-arcade/pachi/files/1.0-autotools.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -1,5 +1,7 @@
  # Process this file with autoconf to produce a configure script.
 +AC_PREREQ([2.54])
@@ -17,8 +17,8 @@
  fi
  
  eval DATAPATH=`eval echo "$DATADIR"`
---- data/Makefile.am
-+++ data/Makefile.am
+--- a/data/Makefile.am
++++ b/data/Makefile.am
 @@ -10,13 +10,13 @@
  objects_v2.dat \
  rooms_v2.dat
@@ -39,8 +39,8 @@
 +	for file in $(score_DATA_); do                                       \
 +		$(INSTALL) -g $(group) -m $(perms) $$file $(DESTDIR)$(scoredir); \
 +	done
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1 +1 @@
 -SUBDIRS = src Tgfx data fonts music sounds docs
 +SUBDIRS = src Tgfx data fonts music sounds
diff --git a/games-arcade/pachi/pachi-1.0.ebuild b/games-arcade/pachi/pachi-1.0-r1.ebuild
index f1cc4a2b7bbf..d8cfae4ed69f 100644
--- a/games-arcade/pachi/pachi-1.0.ebuild
+++ b/games-arcade/pachi/pachi-1.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="platform game inspired by games like Manic Miner and Jet Set Willy"
 HOMEPAGE="http://dragontech.sourceforge.net/index.php?main=pachi&lang=en"
@@ -10,28 +11,40 @@ HOMEPAGE="http://dragontech.sourceforge.net/index.php?main=pachi&lang=en"
 # (should be downloaded and re-compressed with tar -jcvf)
 #SRC_URI="mirror://sourceforge/dragontech/pachi_source.tgz"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/Pachi
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-mixer[mod]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
 
-S=${WORKDIR}/Pachi
+PATCHES=(
+	"${FILESDIR}"/${PV}-autotools.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-autotools.patch
-	rm -f missing
+	default
+
+	rm -f missing || die
 	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_install() {
 	default
+
 	newicon Tgfx/icon.bmp ${PN}.bmp
 	make_desktop_entry ${PN} Pachi /usr/share/pixmaps/${PN}.bmp
-	prepgamesdirs
+
+	fowners root:gamestat /var/lib/${PN}/data/scores.dat
+	fperms 660 /var/lib/${PN}/data/scores.dat
+	fperms g+s /usr/bin/${PN}
 }
diff --git a/games-arcade/retrobattle/Manifest b/games-arcade/retrobattle/Manifest
index c86b7cdc2007..81eacea23ae3 100644
--- a/games-arcade/retrobattle/Manifest
+++ b/games-arcade/retrobattle/Manifest
@@ -2,5 +2,5 @@ AUX retrobattle-1.0.0-build.patch 734 BLAKE2B 4ffa45c16de1e4b61d96bf18c5cf79565b
 AUX retrobattle-1.0.0-gcc6.patch 727 BLAKE2B ba3cf4079f453451e4c75cd219a9069d0aa8ba983a5c54a9429c3528fbb303cea5d74e39737cb8faf9e1b1ffbfc2b6fe12c4d339fb255c8d33bcc8f877d9902c SHA512 c6abf9dea211fa362ed3e2c65bdc4617e0f3419bf206fa2cff92bf6a5f37f0b616ee658468213329aa3de704ec61c0f53b0f450171f8543cb21f620a1e3d6747
 AUX retrobattle-1.0.0-sound.patch 435 BLAKE2B c415d1713858f5c5087c10fa29786ce8ba8127ebb72da6d9f0802609d1740e9265022526ea1bbb04f97b4173a00cbccb07fbfbbc015800a688b64e9c42c0aa42 SHA512 e25737a8fd55ae7e54015a122754811e748e5cb26adf866ddd912547c72acf1ea8a70b33724bd17ee35c959051d4210047aaee8a7a88ebe85ab0c4a1083386a1
 DIST retrobattle-src-1.0.0.tar.bz2 4007959 BLAKE2B efe20ccfc813b5c17b49694ab01a1a341fa2bf2bb45a0aaca99eb5bb1a814f12bfa6354308c0d9cc9937a159a20568312ddead0748b75803d97f9e9d0d86c99a SHA512 2d006fc9a62e57d7fb3c0f0e535a5c702204b6341566064d7683526923839e8a43e14b308e76a8a1f6794f7c682f6344975956877f80bbcbc33ee61cd640ff9e
-EBUILD retrobattle-1.0.0-r1.ebuild 849 BLAKE2B 92ab94e24187ab971675a184123b611a7785486c3704a59eca85336a27d886a27e544ffd3ab5083714534352643afa147ddcf7a99baae3a14fcf1d44eb6d20ef SHA512 231116234290aa5495261c4945ad686d3c2229020984cf464ed772785bc72c3a86b35356b90877ce99c03a394a1e4898b0b2c9bac548ea0467fed2e6b04ad8fc
+EBUILD retrobattle-1.0.0-r1.ebuild 843 BLAKE2B d43337b9ef9f198ea2f2402529a6a0dc3d2aef59416b37642dab5ff74de47f6dc06a974e07cd0e44f32e9ce520953b035dc9ccfa9913550a20c821916ea224ea SHA512 58f35233e990184427e061d59e0b56a74f99be9b8568d2f3b966d60bda1d90b8ce65a1cdaee0a71d42498ce1ddf12d30d239e0e4f78fedcde33d96d83248dd0a
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
index e283c6299a0f..7bbb9fa2dc2b 100644
--- a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
+++ b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
 MY_P="${PN}-src-${PV}"
 DESCRIPTION="A NES-like platform arcade game"
 HOMEPAGE="http://remar.se/andreas/retrobattle/"
 SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
 # test is incomplete
 RESTRICT="test"
 
-DEPEND="media-libs/libsdl[X,sound,video]
-	media-libs/sdl-mixer[wav]"
+DEPEND="
+	media-libs/libsdl[X,sound,video]
+	media-libs/sdl-mixer[wav]
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-{build,sound,gcc6}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-{build,sound,gcc6}.patch
+)
 
 src_install() {
 	insinto /usr/share/${PN}
diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest
index 40851b3fa969..64ee27853eb9 100644
--- a/games-arcade/rockdodger/Manifest
+++ b/games-arcade/rockdodger/Manifest
@@ -1,6 +1,6 @@
-AUX 0.6.0a-sec.patch 660 BLAKE2B ff9277217038b07e9ec4d8df3c09b024761d507881c080616218397a56a30088a1b99494b26ee1d054b80881ed5c9b30aca7fa44fe0210a96f94f14ec5b3a82e SHA512 aed20b03bac5e717a8eaad580b8f5580b26a862cc43ce0e7d5a6d4dcccc1d447ef2efedf333c94b52fa2782018375aa06c57861e6742efe8a8bf70c57b4f2c9a
-AUX rockdodger-0.6.0a-gcc41.patch 516 BLAKE2B 4ed4ab15db86db0e22ce52174d576d9d8e1997142d8f02eb02b6d89f9612ca70cb77d3fa4f97c190837ad954a02e2cc858822313aeb57ac3cc3b4186e1c40293 SHA512 83dee968da1ae24514ffeb5a8aafb8bb9c1c4c94ed54ff2b2dc3dac3084948b88fae21b834918d8514d04ec8c027602540b5e62b72017048e3dcb6e970be5df3
-AUX rockdodger-0.6.0a-underlink.patch 315 BLAKE2B bacc643f6955230cb590f8d87626f3ad2dfa6f31acaec0a8d313ad86082089e9784edaddeab76828a71a522cc758893da0dd65313890d3e9281ab5243fbac79b SHA512 96613eb9716845e3cd4ae164b30063871a3f199d468f4b0f909fe8d7829a3e9649022ee9a93ee20190e522ce8df1d6ba1d09b8977c7600ee378c408e54584aff
+AUX 0.6.0a-sec.patch 588 BLAKE2B 1c6d4217d1a0cde1372549b1dc7e8dacc80c2caced3852a62b924086f4d7c5ce5dd698dc96058f1244a8ab2e82af9d4f31af4db1d609186af7581479bd57434b SHA512 8b9e3efce020a25f35efe277e45e9e7a234260c377fc7ef6feb90be25b3551c5cc74d726fefddac229c90fb6ee1730c98bc641a01c3d7a17ca69bf91d271edfb
+AUX rockdodger-0.6.0a-gcc41.patch 444 BLAKE2B 3418458d34d1b26c62d36327f9b53256e580a6ca7ee77d0cd6a16457aae244a9c5cdd262432506e4b1f843a12e28d72bec4a6e8946980eb6f93d5d6d9ff88900 SHA512 1fc4591c0bc3242a5760bf345c41c1f6f475f5e87e49df58697b91afcdd418864be896d9a674edeb9c38207f4a9b2ed3e2c73cb5d6dae225a7e016a3e4c7ab59
+AUX rockdodger-0.6.0a-underlink.patch 243 BLAKE2B 58e061e45bdb39a7bc23a81270ddafef284234b8ea32e4ad65f08fb6fcc51332dddf4f58480d9981467dd34668fa323fbf625917ea8d3531c857925ee9a54546 SHA512 681f925988471efd34a5a78f7eb8dc916e4fef30d11e2f89f9d14eda4639c3be407d843058aa503dcd6e5e8aad09fb288d6eafb16aac32df0601e2d6d9989ec5
 DIST rockdodger-0.6.0a.tar.gz 410223 BLAKE2B 5ccda4400468d6a7209adfdad3045773bf31581e34dfb77bff7d314ca9d9fa18e6c5a24996259782c002cf8ea611f92388c9ca46be4e0c7492a526421e8e8163 SHA512 d517cc844df21e8772b13d0226841a64bede0cc2f5461fb83d313f49cd99192dcf6af4597e3d1f3e1c60f578437e355ce665e0288415da803a503fb12d8462eb
-EBUILD rockdodger-0.6.0a-r1.ebuild 1434 BLAKE2B a9bb1041a631c6792105d9f2ef411750028fc43d83025350b9ef1e712740d501e5c60d994f4fbb8b2ce000c72d014e8ec4d7ff062b18fb819361191a34c9b369 SHA512 9c2eaea20734b306ade47774cb2a4e1955ea6fc4b92dc930a7e68052bf63089da2b0c3350aa3c7bf3340011461aea0dbea6b598606ff25d14ce508fe7fec5a0b
+EBUILD rockdodger-0.6.0a-r2.ebuild 1527 BLAKE2B 0e3ad21b32f6dbd4348fd5194ee8f75210c89160121e3707371440e058bc4531d379c720f8e9ad7f8ef6ddd3fc38cb7550672eed80fb760d476ed37d2fe9f90a SHA512 94b714f014a078476e96acbe1c3c1dd3c6554e280d8cfd1b9a7974cab025cb85466e600346b9d19dcf77e0a44c0b614bba41b38f5f2009cb1872e824825c9e85
 MISC metadata.xml 333 BLAKE2B 86aa43a28193b28b46fa52ba9a898a26a8f53b43e1c927062d29f34f8bdf952355ed6a333b0336278fce760dd5506588e103e96f7ef9449e0be26c72b6fe446a SHA512 fa4831b21647e72987ac3b956d81b5efc4308004c76213a046bd026a9939687b5f98c633a1f39d693a502f9557248e9810ba7301334cb3e82c9570e29efd6a6c
diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch
index e870cf2d2974..b7af24f160a7 100644
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ b/games-arcade/rockdodger/files/0.6.0a-sec.patch
@@ -1,5 +1,5 @@
---- main.c.old	2002-11-17 23:56:12.000000000 +0100
-+++ main.c	2004-10-29 22:32:00.000000000 +0200
+--- a/main.c
++++ b/main.c
 @@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
      else {
  	char s[1024];
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
index 59e01bba17c3..f69797520975 100644
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
@@ -1,5 +1,5 @@
---- main.c.old	2006-04-24 16:16:13.000000000 +0200
-+++ main.c	2006-04-24 16:16:21.000000000 +0200
+--- a/main.c
++++ b/main.c
 @@ -206,7 +206,6 @@
  struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
  struct spacedot sdot[MAX_SPACE_DOTS];
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
index 87cd8453476c..3ee7d9c5cc75 100644
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2011-06-20 21:25:56.788323912 +0200
-+++ Makefile	2011-06-20 21:26:11.970287694 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -27,7 +27,7 @@
  #SOUNDLIBRARIES=
  SOUNDLIBRARIES=-lSDL_mixer
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
deleted file mode 100644
index 5e0cd21a6857..000000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Dodge the rocks for as long as possible until you die"
-HOMEPAGE="http://spacerocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Modify highscores & data directory and add our CFLAGS to the Makefile
-	sed -i \
-		-e "s:\./data:${GAMES_DATADIR}/${PN}:" \
-		-e "s:/usr/share/rockdodger/\.highscore:${GAMES_STATEDIR}/rockdodger.scores:" \
-		-e 's:umask(0111):umask(0117):' main.c \
-		|| die " sed main.c failed"
-	sed -i \
-		-e "s:-g:${CFLAGS}:" \
-		-e 's:cc:$(CC):' \
-		-e '/-o/s:\$+:$(LDFLAGS) $+:' \
-		Makefile \
-		|| die "sed Makefile failed"
-
-	# The 512 chunksize makes the music skip
-	sed -i \
-		-e "s:512:1024:" sound.c \
-			|| die "sed sound.c failed"
-	epatch \
-		"${FILESDIR}"/${PV}-sec.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins data/*
-
-	newicon spacerocks.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Rock Dodger" ${PN}
-
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}"/${PN}.scores
-	fperms 660 "${GAMES_STATEDIR}"/${PN}.scores
-	prepgamesdirs
-}
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
new file mode 100644
index 000000000000..d446d78f27b8
--- /dev/null
+++ b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Dodge the rocks for as long as possible until you die"
+HOMEPAGE="http://spacerocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-sec.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare() {
+	default
+
+	# Modify highscores & data directory and add our CFLAGS to the Makefile
+	sed -i \
+		-e "s:\./data:/var/games/${PN}:" \
+		-e "s:/usr/share/rockdodger/\.highscore:/var/games/${PN}/rockdodger.scores:" \
+		-e 's:umask(0111):umask(0117):' \
+		main.c || die " sed main.c failed"
+
+	sed -i \
+		-e "s:-g:${CFLAGS}:" \
+		-e 's:cc:${CC}:' \
+		-e '/-o/s:\$+:$(LDFLAGS) $+:' \
+		Makefile || die "sed Makefile failed"
+
+	# The 512 chunksize makes the music skip
+	sed -i -e "s:512:1024:" sound.c || die "sed sound.c failed"
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins data/*
+
+	newicon spacerocks.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Rock Dodger" ${PN}
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/${PN}.scores || die
+
+	fperms 660 /var/games/${PN}/${PN}.scores
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest
index 31066ff3de8e..ab98a23d91e0 100644
--- a/games-arcade/shovel-knight/Manifest
+++ b/games-arcade/shovel-knight/Manifest
@@ -1,3 +1,3 @@
 DIST shovel_knight_treasure_trove_en_3_3_15418.sh 226753557 BLAKE2B 3103871333f5dec931b109ccc8a8820054f8bd934d01daf97bb5ad84e9dfaebd2c79d1943fb7049468f49c9db87c51dec0e08d38469e364bafb8bc50fbd9d40d SHA512 6832593440cc5059f0df37be991bb2e87c071c7ed566b2c6d0f6cc418190be92c4f793f2c694f620b9378914cde13abf9049eba8cdd90b9dfe961ae9a65dc42a
-EBUILD shovel-knight-3.3.ebuild 1612 BLAKE2B 8fef8cc68fe987156e8e5f9ee1db3b8893019678070b4ac2b4e0580cb6a584871c125c6825cf63cec44edce605ce5bac29df4b4210c2c30f1f12605d09111752 SHA512 44e1bac52bb7bedf3fdc288fb8d739e6dbc215fb222c65ee5ec3886f13b5c98f8d2e552794ffbd6cca177472f74164dcafc415db700af5b8368fa699d28cd759
+EBUILD shovel-knight-3.3.ebuild 1614 BLAKE2B 1c1c339842ce7da65c7d03c2b6802cb6a6de443bee5cedcd2f874c38866cf299f1da0e42445cc82ef4a2975a9a36d4eb6d709f25b2f5a5530e19d687373d6038 SHA512 d7b67fa256d6866219d8ea95272b253c2dcbff1cf33c6798a9762c259bc2124986f6c4d75eaf73466b656825a45002c88bc19a06b1eb1ae0f909867caffaf3b3
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
index 656b2c154484..711593617539 100644
--- a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
+++ b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop unpacker xdg-utils
+inherit desktop unpacker wrapper xdg-utils
 
 MY_PN="ShovelKnight"
 DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
 HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
 SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh"
+
 LICENSE="Yacht-Club-Games-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 01fc476fa256..38331a01b778 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,4 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
 DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a
-EBUILD solarwolf-1.5-r2.ebuild 1082 BLAKE2B 4c12ba170a17f10a3942985e22b429789d9c66d8954c7ef2454796836b7dfb6b9a69b443db3487de71b8b4b4d7c9f5287abcde54d131cc12aaa4f93b08484c1e SHA512 853bf1b1a9a5f76da66255159901d05a0fa1808ac9a8da1d28d7b414605bfd89dea1224dd6d3dea9cf61ab73ee20054a814e2389f21c5b6cf39381c7f9480de9
+EBUILD solarwolf-1.5-r2.ebuild 1083 BLAKE2B 495f500fdd6723e2b2622aa1ee35b8b818759c311806bd70efe10c138790b98e64d9765514528af9926cd7c08d86dafe319aee100f1289419162a283b40b1cd3 SHA512 06d6a231859c49849217b936aef9464cf837b293ebff4767e3080c3d9820082dc0fff7df1667c0325a04d61579ebb377f26e1a664caa8add32c4998c4b88f75e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
index 2911c2d187fb..4d060a7fedb2 100644
--- a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
+++ b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-inherit desktop eutils python-r1
+PYTHON_COMPAT=( python3_{7,8} )
+inherit desktop python-r1 wrapper
 
 DESCRIPTION="Action/arcade recreation of SolarFox"
 HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
@@ -17,31 +17,34 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~x86"
 
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	>=dev-python/pygame-1.5.6[${PYTHON_USEDEP}]
 	media-libs/sdl-mixer[mod,vorbis]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 src_prepare() {
 	default
 
 	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
 
-	find . -name .xvpics -print0 | xargs -0 rm -fr
-	gunzip dist/${PN}.6.gz || die #619948
+	find . -name .xvpics -print0 | xargs -0 rm -fr || die
+	# bug #619948
+	gunzip dist/${PN}.6.gz || die
 }
 
 src_install() {
 	insinto /usr/share/${PN}
 	doins -r code data *py
+
 	make_wrapper ${PN} "python3 ./solarwolf.py" /usr/share/${PN}
+
 	newicon data/ship-big.png ${PN}.png
 	make_desktop_entry ${PN} SolarWolf
+
 	einstalldocs
 	doman dist/${PN}.6
 }
diff --git a/games-arcade/stardork/Manifest b/games-arcade/stardork/Manifest
index a5f5e8e2e8f6..365e37860bff 100644
--- a/games-arcade/stardork/Manifest
+++ b/games-arcade/stardork/Manifest
@@ -1,3 +1,3 @@
 DIST stardork-0.7.tar.gz 3951 BLAKE2B a35e8ceed5b5a6eb210408d6a7a32e2c38a3e2bbd05458055e44a1866b1bd0d2f222a6dce8ee8cbf6fe11d0c0541095ae0d9bad8e0b883ea74fd255e96364019 SHA512 3726b55cc2f107a0d69580b3c30406ea2596769433db915d4b3bded4345611c9d67596cbf373b19671960909d0bfdfc997d5c41d677f0309317445aeadcae733
-EBUILD stardork-0.7-r1.ebuild 593 BLAKE2B e65d8708d524c06dcd4f1dabff799f4a39d0160c7983d7174f0648cece2b3369724e1cb906af291479974910a5a593c4c797d60a7e90c90e95fbed05fa360a34 SHA512 dd679250b1555a16e44b5897b240552a6f0cc1a514090d8095c9618a39a9e7112e71ec09033639efe739e10df6db01366c5eb7ab5b1c310aba0e78907a83cca5
+EBUILD stardork-0.7-r1.ebuild 600 BLAKE2B 3918e0abc6ff1a206e09b817fa44f177375cfe6110ee263865551b5d8f0e1cecb298de2040d5dca082b02f60ae686a0492774dbf0e8c7b45e73e06d57504466d SHA512 e4c72cf2602b5ab906f24e85599ea84a6436e5b3ae121d79e1b773d3d5748eeafae3b868e616631fdfdcf59cdb31c621ff0fb5803f34f02f905232c4f80b4b85
 MISC metadata.xml 331 BLAKE2B a08b7d4e1bf2c2afac8b4aaf9ac40efb25aa1cfd8227a1a51371a9fc893a7219f21438134d479f739b7f9e5d7fe668199c9392fdfd08b7248423092f69da0351 SHA512 b02a062748ef75daffb05cb8fbd3ea3eddea2f60b2aa64fbb6d7edb6529f260c60ec56d32f799e437d6dae4ce4b09c381afe8fee145d7c82672e52c830d1caed
diff --git a/games-arcade/stardork/stardork-0.7-r1.ebuild b/games-arcade/stardork/stardork-0.7-r1.ebuild
index d2458f6571f1..d2b7e070c095 100644
--- a/games-arcade/stardork/stardork-0.7-r1.ebuild
+++ b/games-arcade/stardork/stardork-0.7-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="An ncurses-based space shooter"
@@ -24,7 +25,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$(pkg-config ncurses --libs)" ${PN}
+	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" ${PN}
 }
 
 src_install() {
diff --git a/games-arcade/thinktanks-demo/Manifest b/games-arcade/thinktanks-demo/Manifest
index e4aa43c86512..cad855b913bd 100644
--- a/games-arcade/thinktanks-demo/Manifest
+++ b/games-arcade/thinktanks-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ThinkTanksDemo_v1.1.sh.bin 12115802 BLAKE2B 398df35dc7f6020cadfcf36209ddec3c10229f62539f0a6cead3c5b815a36816a2d51e9d09315ccae2e60855a3e7e1310196276758b41e66c7b32e7f102ddfbc SHA512 9134c44c4e02df4bd7edbd3946125598c87dc3adbeff318f0b265dd2c5fbcebd49bd810d848cc5da29c86ad323fdb2c9adc0006b26680b0bd78b4d0de54419a1
-EBUILD thinktanks-demo-1.1-r3.ebuild 1144 BLAKE2B fa96fca23a1659748aba95a423e5a9dd244de6d9ca479fa6374abd40a7f71a402c1643860677c223fca089e9b07e2b73b0c11732298d15747566de0fbd339b32 SHA512 960d72cd762c9f24f90a21f3d801185558e52528af5fe046f70e16ca62583ac5df448bb5310bdbd1b37fa6e1b6714ef7d4c32d5d9322e51533eb626d01f5c557
+EBUILD thinktanks-demo-1.1-r4.ebuild 1142 BLAKE2B cbf195712e63a0571f76382f7418008ebc0c94f79db218babb725f44717db3dce090adff9ba4ad2e5cf64704ef140e5f8910855084a51753f0720abfdceba085 SHA512 7029589e68a4bfb6741820517dbeeb23a7f8c3bba7ccc8752be296b0a7f3ea26be3a800d73cc71e0e1521811bd1e12f8f2c0351de30deb9cab16f96f40c560ca
 MISC metadata.xml 2343 BLAKE2B 81e0b71bd2aa43d390cabc4cf316034817c03a694c561aa223959401a3b90637225ea6b2b2748feee5d9e270a158b92acd9ee689f870f62753c863f7942991b2 SHA512 bdf46a6c55e6cbddc81b70134d0d906dc2e0c28714c0278affcd60465c8ab1b5e9ad440e463db1c6a589b080d8a3e7c88a2ee1f857d29f1515f5b92f9146b234
diff --git a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r4.ebuild
index a672cd15f03e..7b6c73e06c39 100644
--- a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild
+++ b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r4.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop unpacker
 
 DESCRIPTION="Tank combat game with lighthearted, fast paced pandemonium"
 HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=12"
-SRC_URI="ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v${PV}.sh.bin"
+SRC_URI="http://demos.garagegames.com/thinktanks/ThinkTanksDemo_v${PV}.sh.bin"
+S="${WORKDIR}"
 
 LICENSE="THINKTANKS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="
 	media-libs/libsdl[video,joystick,abi_x86_32(-)]
@@ -21,9 +22,7 @@ RDEPEND="
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 "
-DEPEND=""
 
-S="${WORKDIR}"
 dir="/opt/${PN}"
 
 QA_PREBUILT="${dir:1}/ThinkTanks.bin"
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index d11ce04e52c5..5c7d819331c8 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -1,7 +1,7 @@
-AUX tomatoes-1.55-c_str.patch 573 BLAKE2B eccedf249d78074ce6292d580ad71cf9ff9b55f70d03976f26225f144b06c090714c4815c925cfc425bd8094e28fb1e5d0a5bf3ed6a48b6400c892afc922a812 SHA512 fce01efcdea6f14c497b747158e03e57fc39f532ddad7f8da80d6c94be6e9ec6b46b43e908e96f9b3744029ff285699f72b91a73b21b3e213d7054bf4e14f927
-AUX tomatoes-1.55-gcc43.patch 278 BLAKE2B 6597c2e500add91cf58f3a45e88d26b684f90b6a7a4644063701958cd5ba9b7f2d7c296f4c0adbd7718e72fdfc0198cfb0531d256f4d6c37d2ac54afa8b39ae1 SHA512 b0f6e5c3468902f73b2f88327f510b726082af6ace75d15f1d72c95d7ff19cfefef5558f2cdb2e0cf363a80f3c624c912825a1abb251608577bd617972b88e1c
-AUX tomatoes-1.55-underlink.patch 977 BLAKE2B 15d602a7a1618e331a4fe62ee72c22ff91af47cd1dfbf11f6b7039d7e43599c97d9a79705091f65cf1f2be5adbc8d8ed11f0246a8386134bc5694de901302175 SHA512 c6b1fb64b0196f0eb6a6f0d6a779d437d09901737670f66309598a84706615e1c9e48e60a7f6db15ce10f9237c1bdf8589cec39c46a4659fd4fcb3fe39225aa8
+AUX tomatoes-1.55-c_str.patch 500 BLAKE2B b1ddb221951e1e03c01372440660c0d62e92d1ea08bf5eb5bbbbdc397cb447de1b50b18890679254d7824699faa74f818c5192ac9a35c8ae8a043c4c804c5b83 SHA512 43d34e18fb25ca5b1ba1815b3f801f58763288cb5075f40dac6e32bc69d943d1bf99cb11fb1933a1b4d64b026a72dc5d0eb1eb7563f319e781167c964b3c02f2
+AUX tomatoes-1.55-gcc43.patch 282 BLAKE2B 96ff4d81ca15fe6813dc3df77fdb126b4907d995f8c6179496a1212d5c0f636b23c684ddaafc6c850de78514d66af054e77bec8812567c95bd563a70d22bada6 SHA512 e40f5602f628481de6385a437300c602dc930ced906aca9e632783482052b8d0c7638d323f6f07deafc05c95f706c2901dbb1e27e18a390a03338f2237442673
+AUX tomatoes-1.55-underlink.patch 905 BLAKE2B 2deffc2f21569ed78e032400bac9dc3d77ea6bd2916e986d586eff6796018df632b8d31fc396830db683a7fcf1641b53b1d38c8596683f9dcd283445998d3b66 SHA512 6917df7c096827749e4dbe641822c68a65887215c79a3c7392116d72bd3e76ff60192ce168668ad7b5cb01f0750eeb47ccbe54d58c3a0f560b8340ca265b1595
 DIST tomatoes-linux-1.5.tar.bz2 8807421 BLAKE2B ee2128018d13d274b0ed5b27f9339b4e9d47a15753411c30d4174607c252d10d64a40e40b25454adb6f14ec96845b92cf9b0fe57b3bdcbbb70fe905ec0bf1c0e SHA512 517f592bb3c3fb43cb740c58011f06b7a71c96eaff74ce1088db8dbd4aafa3463bba516547cd010e9ef2ca947fd36962c3d13ece6e979cab8adf01ffa991c308
 DIST tomatoes-linux-src-1.55.tar.bz2 62947 BLAKE2B 22561900842dfe4cb56128ddaf471fac56a2c93b4c24ce3cca7045d10235ab60b81184c9617f9f4d10877df23e6db0d5abc0dc032d38788993daab1a2c49ab1e SHA512 b5a6287659746179f0418630c55d34dc34897b532687007386b0b540ec728cc2492813f0d454314994a26a3629a24c802630085f64b969d1e6ea9ec936f5fe35
-EBUILD tomatoes-1.55-r2.ebuild 1590 BLAKE2B 8fcbf3ecad477c5f4e3d80082be96ee75f951233d7be70f7538692ccc91e737e55cfdb50968bdde922f579009a35e9e6ed6da21928af30e39298e74368b1aa4d SHA512 253966b1037eeb4e4143ed467f93e18df6eda3e0cb89a8a4e462b71925d72aff3faba5b685bb18b4a6be03173e200ca43f2c4fe6c6f48e764dc9bde98e07a068
+EBUILD tomatoes-1.55-r3.ebuild 1627 BLAKE2B 2be42abe1e64c49c0c27415fac17291de29c213328b0a71224c3fbf81a5077729c86e017a249aef16f0651a205d1759f2dbc0f318ef9a49bb386a7283ead31a5 SHA512 d0399e6fd944d6908f8137625c51d8192c66a95900b490368ce491f965c8f0472894a655e20a86a401c65260f7fec430c571bc337fb9bc2a1d6c4b65c34e3671
 MISC metadata.xml 331 BLAKE2B 312d2ef06020a89fa08e79d82b22727eff32e689182f3f142bbc788555d2b05ddf93414a616deff188bc6d2ae35561da8fd832c2541c404d6136da144950c5b9 SHA512 adee588bcc930244c19ea9a3ac34b70c3afbbbed2b68d61289742fd7ca3d97eae5724cef90d350a4e5b8ff8b594f8d25fc1a5fbc672459034d0a492bb155223d
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
index dd6927e54153..f001179a837f 100644
--- a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
@@ -1,5 +1,5 @@
---- src/config.cpp.orig	2004-09-27 11:35:48.000000000 +0200
-+++ src/config.cpp	2006-02-13 00:00:01.000000000 +0100
+--- a/src/config.cpp
++++ b/src/config.cpp
 @@ -78,6 +78,7 @@
  // makefile.
  char *get_config_location(bool write) {
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
index cd85e31e5936..95bf7ba6eddb 100644
--- a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
@@ -1,5 +1,5 @@
---- src/config.cpp
-+++ src/config.cpp
+--- a/src/config.cpp
++++ b/src/config.cpp
 @@ -27,8 +27,9 @@
  
  *************************************************************************/
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
index c028c79ba4a7..bc7763bf492e 100644
--- a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
@@ -1,5 +1,5 @@
---- makefile.old	2011-06-18 17:35:38.947020335 +0200
-+++ makefile	2011-06-18 17:37:42.337811088 +0200
+--- a/makefile
++++ b/makefile
 @@ -48,7 +47,7 @@
  LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg
  else
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
deleted file mode 100644
index dd5658f861bf..000000000000
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DATA_PV=1.5
-DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
-HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
-SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
-	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv ../tomatoes-1.5/* . || die "mv failed"
-	mv icon.png ${PN}.png
-
-	epatch \
-		"${FILESDIR}"/${P}-c_str.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-
-	sed -i \
-		-e "/^MPKDIR = /s:./:${GAMES_DATADIR}/${PN}/:" \
-		-e "/^MUSICDIR = /s:./music/:${GAMES_DATADIR}/${PN}/music/:" \
-		-e "/^HISCOREDIR = /s:./:${GAMES_STATEDIR}/${PN}/:" \
-		-e "/^CONFIGDIR = /s:./:${GAMES_SYSCONFDIR}/${PN}/:" \
-		-e "/^OVERRIDEDIR = /s:./data/:${GAMES_DATADIR}/${PN}/data/:" \
-		makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	dogamesbin tomatoes
-	dodoc README README-src
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r tomatoes.mpk music
-
-	doicon ${PN}.png
-	make_desktop_entry tomatoes "I Have No Tomatoes"
-
-	dodir "${GAMES_STATEDIR}"/${PN}
-	touch "${D}${GAMES_STATEDIR}"/${PN}/hiscore.lst || die "touch failed"
-	fperms 660 "${GAMES_STATEDIR}"/${PN}/hiscore.lst
-
-	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	doins config.cfg
-
-	prepgamesdirs
-}
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
new file mode 100644
index 000000000000..088f0a4563b1
--- /dev/null
+++ b/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DATA_PV=1.5
+DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
+HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
+SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
+	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	virtual/opengl
+	virtual/glu
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c_str.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_prepare() {
+	default
+
+	mv ../tomatoes-1.5/* . || die "mv failed"
+	mv icon.png ${PN}.png || die
+
+	sed -i \
+		-e "/^MPKDIR = /s:./:/usr/share/${PN}/:" \
+		-e "/^MUSICDIR = /s:./music/:/usr/share/${PN}/music/:" \
+		-e "/^HISCOREDIR = /s:./:/var/games/${PN}/:" \
+		-e "/^CONFIGDIR = /s:./:/etc/${PN}/:" \
+		-e "/^OVERRIDEDIR = /s:./data/:/usr/share/${PN}/data/:" \
+		makefile \
+		|| die "sed failed"
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_install() {
+	dobin tomatoes
+	dodoc README README-src
+
+	insinto /usr/share/${PN}
+	doins -r tomatoes.mpk music
+
+	doicon ${PN}.png
+	make_desktop_entry tomatoes "I Have No Tomatoes"
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/hiscore.lst || die "touch failed"
+
+	fperms 660 /var/games/${PN}/hiscore.lst
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/${PN}
+
+	insinto /etc/${PN}
+	doins config.cfg
+}
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
index a84b3ddd1d9b..3f65dbedd492 100644
--- a/games-arcade/xboing/Manifest
+++ b/games-arcade/xboing/Manifest
@@ -2,5 +2,5 @@ AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de
 AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0
 DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9
 DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454
-EBUILD xboing-2.4-r3.ebuild 1404 BLAKE2B 16a024ed57e9bda8b479946de43195897295a1912feacf6c2b7df5bbc22cb6150b65f8ec39219dd60048c8a958ffd29162c11d4c37acc694ba4c563687526834 SHA512 cbd6a4b8337ab72861bb32b24ea207433c373055344cff382db59a5bb28acbce46536009c4071a426e4467400ff815697f242a5ec01c4b9b9c0fbf371750ba4a
+EBUILD xboing-2.4-r3.ebuild 1647 BLAKE2B a8f01f6c4f9929fb722906bcc4e064975a4aab6567a15e6ede841084400a1ecae85d4c9c3e715df5647eaec848bfc562146da64e4b9b06146855744ff684ba42 SHA512 cbd0a6235574a8fb6fc8c9e408ada506a06fec8c8b4ce5c9874a7767a7d1d0638f5ced997711b356ad3cf66c5cc2ece46fde2736f866e05bd7c19acf9e49f968
 MISC metadata.xml 214 BLAKE2B 86c649fbb74ec8627ccee25d0b0d3cbac3b6f9ba8e164327c15faf02abca8583969e3e2a35bb629643500d079e873cdb8093c5ed3d7bb5c4348269d485088ae2 SHA512 eb9f85ca2fca14bf2aae5fe6001c2d7d1cf93e00bd4de8dac2f71f23ad3c7a7c8fcd65593b1adf77a07260cc546339846f4b33ec99032e353da07d1b3bff8f08
diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild
index d47824221347..354b48020f56 100644
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r3.ebuild
@@ -1,59 +1,70 @@
-# 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 flag-o-matic eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks"
 HOMEPAGE="http://www.techrescue.org/xboing/"
 SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz
-	mirror://gentoo/xboing-${PV}-debian.patch.bz2"
+	mirror://gentoo/${P}-debian.patch.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="xboing"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
-RDEPEND="acct-group/gamestat
+RDEPEND="
+	acct-group/gamestat
 	x11-libs/libXpm"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-misc/gccmakedep
-	x11-misc/imake
-"
+	>=x11-misc/imake-1.0.8-r1"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${WORKDIR}"/${P}-debian.patch
+	"${FILESDIR}"/${P}-buffer.patch
+	"${FILESDIR}"/${P}-sleep.patch
+)
 
 src_prepare() {
-	epatch "${WORKDIR}"/xboing-${PV}-debian.patch
-	epatch "${FILESDIR}"/xboing-${PV}-buffer.patch
-	epatch "${FILESDIR}"/xboing-${PV}-sleep.patch
+	default
 	sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die
-	eapply_user
+	sed -i "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
 }
 
 src_configure() {
-	xmkmf -a || die
-	sed -i -e "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
-	append-cflags -fcommon
+	append-cflags -fcommon #707214
+
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
-	emake \
-		CXXOPTIONS="${CXXFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XBOING_DIR="/usr/share/${PN}"
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		LOCAL_LDFLAGS="${LDFLAGS}"
+		HIGH_SCORE_DIR="${EPREFIX}/var/games"
+		XBOING_DIR="${EPREFIX}/usr/share/${PN}"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
-	make \
-		PREFIX="${D}" \
-		BINDIR="${D}/usr/bin" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XBOING_DIR="/usr/share/${PN}" \
-		install || die
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		LOCAL_LDFLAGS="${LDFLAGS}"
+		PREFIX="${D}"
+		BINDIR="${ED}/usr/bin"
+		HIGH_SCORE_DIR="${EPREFIX}/var/games"
+		XBOING_DIR="${EPREFIX}/usr/share/${PN}"
+	)
+	emake "${myemakeargs[@]}" install
+
 	newman xboing.man xboing.6
 	dodoc README docs/*.doc
 
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
index b4dd759817b7..f7732150d11e 100644
--- a/games-arcade/xgalaga/Manifest
+++ b/games-arcade/xgalaga/Manifest
@@ -1,3 +1,4 @@
+AUX xgalaga-2.1.1.0-respect-AR.patch 358 BLAKE2B 99e600a4cd2dba46b774e50cb54a303593a22c979385e5a891a525ee6685bb3429f843cfd5737a1d49b2fa96e0118294273c4f5f377c08374b15217fe5a9ccce SHA512 4e2283d8bd7b8b974d1df9e83945e215355204a4746ea2ba3e0a4a8179d794ce85f226526007cc5d88092baa06bbd9fc1bfd00f366c45014e233cc3a1ddf8aa9
 DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
-EBUILD xgalaga-2.1.1.0.ebuild 1270 BLAKE2B 2f312b99ca63124cb1da72e0e7ddccb981c4e2bb317ef73bab24eec0f785db1f90998715b27c275c1cc857e8a6cd32e4845968cc1e938c38b4d72a38b7151279 SHA512 2dca4cde2f85ac9ccb179037af473138d1fb88d6a423ebee2387a8ef79b7ae75a4ccc6af3bfe37f0119191843e70f9d01797e373c46ab06fed49374ee5577a46
+EBUILD xgalaga-2.1.1.0-r1.ebuild 1499 BLAKE2B ab130acab095ca4edd4938a5c422dcce41ba6c4898cab46b9e0975cf5c58ee9f4edbbab917c2c1479461dac098b348425d93b030e118698cd041e73bfd56653b SHA512 13021e7f56a0456ef3b0a2da52cba7d9b95df54c75f38459c3977f9834073cdc6487c761147eb6b51f4e4c855406f0bbdf07d3483a812f2eccf78ee4842c7fbd
 MISC metadata.xml 330 BLAKE2B b3e61a8f4911203a72c70798959045a62572b4a814bbf8f03ccf17f8da74eaa4c542883da6f2ff780c7e83ab26398ff95a46b36a41c22785903b0299707e6e9c SHA512 2c0045dadc3b72dda9b7f3389aebb5a2d38b91f2cd63891a9bd97e2f23971c916ce515cbbda6b0c6f2b8a600fc56bd77d9db749d223eee5cd6edc99525217545
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
new file mode 100644
index 000000000000..eedc9b24ce17
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -14,6 +14,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ AC_ARG_WITH(xpm-lib,[  --with-xpm-lib          Directory containing libXpm (may be autodetected)],xpm_lib=$withval)
+ AC_ARG_WITH(sound,  [  --with-sound            Type of sound to use (native or nas)],sound_type=$withval)
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index 4d3b86a97566..d644d2087dd3 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-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=5
-inherit eutils games
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="A clone of the classic game Galaga for the X Window System"
 HOMEPAGE="https://sourceforge.net/projects/xgalaga"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
@@ -21,34 +21,49 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch
+)
+
 src_prepare() {
+	default
+
+	eautoreconf
+
 	sed -i \
 		-e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \
 		-e "/\/scores/ s:prefix:localstatedir/${PN}:" \
-		configure \
-		|| die "sed configure failed"
+		configure || die "sed configure failed"
+
 	sed -i \
 		-e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
 		-e 's:make ;:$(MAKE) ;:' \
-		Makefile.in \
-		|| die "sed Makefile.in failed"
+		Makefile.in || die "sed Makefile.in failed"
+
+	sed -i \
+		-e 's/AR = ar/AR = @AR@/' \
+		libsprite/Makefile.in || die
 }
 
 src_install() {
-	dogamesbin xgalaga xgal.sndsrv.oss xgalaga-hyperspace
+	dobin xgalaga xgal.sndsrv.oss xgalaga-hyperspace
 	dodoc README README.SOUND CHANGES
 	newman xgalaga.6x xgalaga.6
 
-	insinto "${GAMES_DATADIR}/${PN}/sounds"
+	insinto /usr/share/${PN}/sounds
 	doins sounds/*.raw
 
-	insinto "${GAMES_DATADIR}/${PN}/levels"
+	insinto /usr/share/${PN}/levels
 	doins levels/*.xgl
 
 	make_desktop_entry ${PN} XGalaga
 
-	dodir "${GAMES_STATEDIR}/${PN}"
-	touch "${D}${GAMES_STATEDIR}/${PN}/scores"
-	fperms 660 "${GAMES_STATEDIR}/${PN}/scores"
-	prepgamesdirs
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/scores || die
+
+	fperms -R 660 /var/games/${PN}
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
 }
diff --git a/games-arcade/xjump/Manifest b/games-arcade/xjump/Manifest
index f6c3f609b8c9..9c08b5b08fdd 100644
--- a/games-arcade/xjump/Manifest
+++ b/games-arcade/xjump/Manifest
@@ -1,5 +1,5 @@
-AUX xjump-2.7.5-ldflags.patch 407 BLAKE2B d4a09bcb067facb9066156cfe2d5c4ec533492ab5e74d802c5976efa176c75c83e52077333b53dd741f2718f92b78d869b04c8994a5a171a01e3a3d1773a6b0f SHA512 8c21088e09053906c20f13027832d1cd0778c6707b6764a93c6cc5de904a2aa80a80ac5fa8372885889beca82f4cbb8c637ca0c186f05e54d441d2f15957b6af
+AUX xjump-2.7.5-ldflags.patch 335 BLAKE2B 53685cae49b253939a1f3e1172295294e1552918b86a6559f2a955d0fedcafd316de94b614a0298ee1313d2b1583437985285f026ec8d228afb0652ccc08e47a SHA512 e5fa4970475a5e00c42b11da05dfb18579080dd1d0c9e18e7077c709dbcab5e45322a636a6f12885248dcc771cbf615b4bcbe1fe99d3119f2da6b422cfef27c4
 DIST xjump_2.7.5-6.1.debian.tar.gz 9803 BLAKE2B 0a51a579aec18c71561f32d1f6321c383c8137dbe3923f3afdf00100f1c47ec062e2200a04a3281f32124f5fe72094abb6a1fc6a86de00c4886d872a21fe9a79 SHA512 c4962acd25c4cabef37acd3b5d39867a955f2fa769cc203fb00edfe37f37ce25369099b589a282189847e7bffeb874b4eaf8deea9320a9083da7e95425625cf8
 DIST xjump_2.7.5.orig.tar.gz 15940 BLAKE2B 9a022f9c6f522d8977268cd00709cc7a8aed9cf6ead042d1c75c0c0e7c011a1898690fa74e957198c5916806da4cc3d80d7d235342e7e41a33c2086553b91075 SHA512 6ce846d6681bf8b084edc06f8415a57f66d1778ec9af8b9b170f4f37292a8172b3507a08c85032a5b8588b50a7f2eefe205add4c779edd7c7ef8fb6d818d9300
-EBUILD xjump-2.7.5.ebuild 1261 BLAKE2B f39333b853d5a18ba79a37b42bba83bebb0a831dc6318b4bb67ccadd10d2167fe1c23b5a2b943c8348f5715ab810796044fddd1e25b34fc393ec36be6384159c SHA512 158dd39465505255b641684aa7769687f06569957a872d4c5db2da6094e424669a95cfd1967b952488f77fdb256c11b1bc7ed7a58e6c70eed6bac5d5e06f13d2
+EBUILD xjump-2.7.5-r1.ebuild 1445 BLAKE2B 581d4cb8d6b0f516c4dd94dfbc7bbf6303e6fe8120915075af34699fe4eddc60c03fb092fc5d0d37ca5936b740aa837ef3ff4c4490cd093ec4a8116ab96eb35d SHA512 661f55276b3bd10fa119205009dff1b44eb0618dc900904e48a9c9dfbd6ca208611dc4ab18b5faf352cdf2c15b965c07bceeeeceb803c8ee149f62a2e1448542
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
index a30736811318..7cff45c60653 100644
--- a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
+++ b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-01 07:05:03.000000000 +0200
-+++ Makefile	2010-10-01 07:05:39.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -28,7 +28,7 @@
  ##########################################################
  
diff --git a/games-arcade/xjump/xjump-2.7.5-r1.ebuild b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
new file mode 100644
index 000000000000..5e3328386b46
--- /dev/null
+++ b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DEBIAN_PATCH="6.1"
+DESCRIPTION="An X game where one tries to jump up as many levels as possible"
+HOMEPAGE="http://packages.debian.org/stable/games/xjump"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
+S="${WORKDIR}"/${P}.orig
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/01_overflow.patch
+	"${WORKDIR}"/debian/patches/02_fix_repeat.patch
+	"${WORKDIR}"/debian/patches/03_source_warnings.patch
+	"${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch
+	"${WORKDIR}"/debian/patches/05_unneded_deps.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	# set up where we will keep the highscores file:
+	sed -i \
+		-e "/^CC/d" \
+		-e "/^CFLAGS/d" \
+		-e "s,/record,/xjump.hiscores," \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin xjump
+	dodoc README.euc
+
+	# Set up the hiscores file
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/xjump.hiscores || die
+
+	fperms -R 660 /var/games/${PN}
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/xjump
+}
diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild
deleted file mode 100644
index 58d403ffe1bd..000000000000
--- a/games-arcade/xjump/xjump-2.7.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DEBIAN_PATCH="6.1"
-DESCRIPTION="An X game where one tries to jump up as many levels as possible"
-HOMEPAGE="http://packages.debian.org/stable/games/xjump"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXt"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}.orig
-
-src_prepare() {
-	# Where we will keep the highscore file:
-	HISCORE_FILENAME=xjump.hiscores
-	HISCORE_FILE="${GAMES_STATEDIR}/${HISCORE_FILENAME}"
-
-	epatch \
-		"${WORKDIR}"/debian/patches/0*.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# set up where we will keep the highscores file:
-	sed -i \
-		-e "/^CC/d" \
-		-e "/^CFLAGS/d" \
-		-e "s,/var/games/xjump,${GAMES_STATEDIR}," \
-		-e "s,/record,/${HISCORE_FILENAME}," \
-		Makefile || die
-}
-
-src_install() {
-	dogamesbin xjump
-	dodoc README.euc
-
-	# Set up the hiscores file:
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${HISCORE_FILE}"
-	fperms 660 "${HISCORE_FILE}"
-	prepgamesdirs
-}
diff --git a/games-arcade/xscavenger/Manifest b/games-arcade/xscavenger/Manifest
index 3624f84a1a6b..32528c761b6a 100644
--- a/games-arcade/xscavenger/Manifest
+++ b/games-arcade/xscavenger/Manifest
@@ -1,4 +1,4 @@
 AUX 1.4.4-gentoo.patch 5528 BLAKE2B 9812d8fa63b449dc207804452566a2afe1360843a9866203f7c065c60eeb5bc13c42c80af0224d073ecdf65085c813d040551d5acf43f26381481c8d0dbc682f SHA512 105c3cf3cf2e02ca3350901716b268e35dbb414c5d5eb233b6fef897fab3f969ab8eec67cfc9080df75d9372a4955be7212bfc2cfe8efd592709a460a164e5bd
 DIST xscavenger-1.4.4.tgz 193346 BLAKE2B eb86b97fad8a9d261935579d298f43e7063fbd0624e8fd654c72b4130e98db38541d54c59938375c8d6df4b50193436f86826c49b8bafe123b4be5c80d3f75d8 SHA512 5f200912b9114ea0c09f0bfcc3f06be2e7c2e1700a744319081f5f3a22c8b93663477076af27837326acf9830af6f597cf8f8fb44562db7d00128321487841ec
-EBUILD xscavenger-1.4.4-r2.ebuild 891 BLAKE2B e8e39d8ee2ddf8f9540d07c75b714daa379eb2f0a7a9cf20d83c69abe14ccc1fd18078d920623716f0fb898c6d56ab57f5b703c8a57e55b207ab0dffae0adcee SHA512 54f5926eabee5c6411cba205dc798c19eaf5f5729e6a02126cbba02b18ff2c142eb4606a92181c4c71391ce12a2f2cdb51da835e132eb310786ab21a3b865f1f
+EBUILD xscavenger-1.4.4-r2.ebuild 983 BLAKE2B 6cfad2cb4b77412a3f72e1db4fa5e422b6771fa8bb0c6707c10b9920cb611cfea47dc0f1442f12d2f8d4027d74e17e0da5d8bbf6d68e5c28c95142458ca6d364 SHA512 ffdc80b3163fc43f0e6380718a2bd0d0aa7e9ecc0597ff132526c86b21495227283463467bd303d98b5869dce1f777a9dd20e5d2ed56bf207beb5ef8f2852807
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
index 78c6be00a5a6..26f6aeae2f8d 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-BDEPEND="x11-misc/imake"
+BDEPEND=">=x11-misc/imake-1.0.8-r1"
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}"
 
@@ -33,7 +33,8 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
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-arcade
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)