gentoo resync : 28.04.2021

32 files changed, 147 insertions, 133 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index ed75760472e7..3092865d24a4 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/baldurs-gate-ee/Manifest b/games-rpg/baldurs-gate-ee/Manifest
index 217e68272e5e..8b4e57811f5f 100644
--- a/games-rpg/baldurs-gate-ee/Manifest
+++ b/games-rpg/baldurs-gate-ee/Manifest
@@ -1,5 +1,5 @@
 DIST baldur_s_gate_enhanced_edition_en_2_5_23121.sh 2892168067 BLAKE2B 7e20922f539be65cf7371f7f1706873e5a147313e3aa0335bfa5d6c4456a40665260a36abab6e73361c5f9c0a0bc2faff6e719dd72fb0ddd8b0e1c22d6eaedd8 SHA512 b5b84148b35984109454e1299ee29d287750172e617fb97e65c46b2c9419173348b37d54587bd44a3eacb6380c9b13e4be91af5625009cba797843483be7165d
 DIST gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh 2877124067 BLAKE2B 244e93ae089703c9fae3dcfcad4fb9c1eb32695e7288f7a05b3f2996887f90d6912e745e9b47a93ba45ee3ddda8363e69d22e62c57258ee54c24c47f07b2f619 SHA512 56d4796a959658f29cabef6e7339db5ba9fa792d9fd899ebc375c9b5cf94305b6d11c21d41a8809fcb1cbe38ecb4bc7152158ef19c87395374ab9060f48756a6
-EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1378 BLAKE2B 6b633880e2e9798f8657c6bc1ed56cb313e7798e6ff77b2e7dc3ef905f2f44102def4ff0c642ccc673b8940852126f61e7b14f2624bb0937c8a1c0eb29050cf6 SHA512 3e8aed5016dacd88cd0226aaa70c8875e72c76ad030181740e139dcef8e03dc3be51649f254da88286af363dde6f45ded52f2531ff60bb69c3ae783f2370d740
-EBUILD baldurs-gate-ee-2.5.23121.ebuild 1207 BLAKE2B 63700b6f469363a96bb2d39edc096353182c68e71945bb406f77e3b4af6dcb0c1d0422bad3ee6cd98cf9b688c778201373dc5fd78a7e69dee44b79d69026d10a SHA512 cff50d9b097c149df3bffe6c4d2acac644588e1e32591cc731074523ac1cdd2f7b546ef96440219baa0cf7484ad2bc029d2362aaa6b54a4cd269b3ec2aee12c7
+EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1387 BLAKE2B ac79f4eb6836fe9ae9bf6bf7bf232a914d9c65b8f9be3d4fa6ef5417925f080eab9459a95a0e556ebc9579c55c64731268e0e9e7db68754c78a6a7cc41355ead SHA512 a13ac6c7a1b487df96b7e47e7e0dceb4a42ac5929fe871bfe283f40bc15b79c50ff9a5c506f2de2a14fe0a0169b91ca3c3ce36356acd9cc69ac326e5c918d07b
+EBUILD baldurs-gate-ee-2.5.23121.ebuild 1206 BLAKE2B 50a0a824ccb1d5811a6f5978d7eba9d665e2cd812982a9a9f9af41965c029ba2e2a02462335c24493aa1d6c49552890264cb2761eb89443487ca5b07b35df2a2 SHA512 4c90d9c7c5f92d4089b7c2a22673a7346f4cbac47a132bc56fc532d086eefdfddcc55bc3af6b83963ccd873020b4ba310f9cd4776431a61cf69563086127bedb
 MISC metadata.xml 814 BLAKE2B 59a165a1cb3b9c9285f1a7af25abb882badbd57618c8202aeda0cd3ba14248e8138c6a1f03805b98c0926a44b68ecb189905b8e681b0142af2df7513bcf1eb9f SHA512 aeb6e4d4fc900f0dbb0eebf8495ed1e5722af2fd90234893364ee7e45f2ed7ba2137188df23acef65d70e3a99c161c5b0d65245961324abd6d576e386bfee3b5
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
index db0585c3d93b..da5f411b2430 100644
--- a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
+++ b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils unpacker
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Baldur's Gate: Enhanced Edition"
 HOMEPAGE="https://www.baldursgate.com/"
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.5.23121.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.5.23121.ebuild
index 46669623b8ff..54dbbe7d27ed 100644
--- a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.5.23121.ebuild
+++ b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.5.23121.ebuild
@@ -1,9 +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 eutils unpacker
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Baldur's Gate: Enhanced Edition"
 HOMEPAGE="https://www.baldursgate.com/"
@@ -14,12 +14,12 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="bindist fetch"
 
-DEPEND="app-arch/unzip"
 RDEPEND="dev-libs/expat
 	dev-libs/openssl:0
 	media-libs/openal
 	virtual/opengl
 	x11-libs/libX11"
+BDEPEND="app-arch/unzip"
 
 QA_PRESTRIPPED="/opt/${PN}/BaldursGate\(64\)\?"
 
diff --git a/games-rpg/broken-age/Manifest b/games-rpg/broken-age/Manifest
index a2712efb897e..05addd93b79a 100644
--- a/games-rpg/broken-age/Manifest
+++ b/games-rpg/broken-age/Manifest
@@ -1,3 +1,3 @@
 DIST BrokenAge_linux.tar.gz 2159926882 BLAKE2B 351fd74310ce2a03682151b8112d5831d3d495a6fc9cba68a366205033ce0f35f3446f30ccf98024462f144db3782faf68f73944c814a537cdde8c09f6afbadc SHA512 6642fdae52dc5a22dcbaa1c9db865bfe8dee2365014c1854c53436a1cc4fc842134ad96d9576de221cb494d6e04ea6d30f213c5a62a19f29aaf466740e670284
-EBUILD broken-age-2.4.800398.ebuild 994 BLAKE2B 2035faa230b409f9cced72c574d89d4a980703536864bc4d5c8f95ba6f96c0fccb28876f577d3b2e1e954e32f3b6696085ea2b45b61af4e015c999dfd5cd0d57 SHA512 7c55c806436e5546ef7633d133f81298cfc310cedae359e78fb94bd73a3989eaa081d18a45fee82c5e87aadb6843dce55db4d0e5e11177107c424321722e3a75
+EBUILD broken-age-2.4.800398.ebuild 994 BLAKE2B 4c896b3b7300cc79826b76b1f16c094186ef3d2eb6add597a2a1c383b365645875353fd795e626ee19b4cfb735535f868f0a05821b98bcb5964651c98c4dc21e SHA512 3063efd7431b03ee244fc4d3d19fdedde2c970a994782a4385d7b8cd16bedf4d72f7a10d7a7045f58cdd46366ec66349bbd497e08dcae92ab7424df93917c054
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/broken-age/broken-age-2.4.800398.ebuild b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
index fed3b2fba16a..f20322563208 100644
--- a/games-rpg/broken-age/broken-age-2.4.800398.ebuild
+++ b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop xdg
+inherit desktop wrapper xdg
 
 MY_PN="BrokenAge"
-DESCRIPTION="A point-and-click adventure from Tim Schafer's Double Fine Productions"
+DESCRIPTION="Point-and-click adventure from Tim Schafer's Double Fine Productions"
 HOMEPAGE="http://www.brokenagegame.com"
 SRC_URI="${MY_PN}_linux.tar.gz"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
diff --git a/games-rpg/coe2/Manifest b/games-rpg/coe2/Manifest
index 10dab3410667..bc9270166954 100644
--- a/games-rpg/coe2/Manifest
+++ b/games-rpg/coe2/Manifest
@@ -1,3 +1,3 @@
 DIST coe2_2007.zip 4937222 BLAKE2B 4640e7819d0e000b3e355f20f364f84d0cc899acd27e33bae95cece843a724918b8a3cc6a538d39478cf5070fd71658637dbc127534d5182a914f6d0f56faff0 SHA512 db0d4ee2016ef3cf7159c227c494346fa0a0e9f9b20a6b520b67899570e3135a4286d6ada2f85d7ea7b55a1baeada41654d4fab29f5996357608f0d2d654b2ed
-EBUILD coe2-2007-r1.ebuild 1368 BLAKE2B 9e0e5391d3fc5d20ee72a8020b69bacffec76859648112363dbac0b42db0818b0c856a244396036a40287444ebd914616481ed1ee64b24bcb87af40fc08865ad SHA512 03d06937428ca48eac60c03ffc6c747c0849635bfc890ad1baac807007248a4ef61e99520056aadba261e26c8e7961dd18edcd86419c979ecc6704ed85e180ec
+EBUILD coe2-2007-r2.ebuild 1375 BLAKE2B fd8a8116058ab4a886009a3b5e9fc069e43790726146f8c6b8e4b2124ed4eb1eeb8d41ec3781fb8bed851faec80197fd9d24d737c2b3fa7a1ae8a07230793b4e SHA512 3085c4c903e698e94b757d2a9743ef142c2ed959fa8753b16dd83dc4b700065f5f2a457857773678f3ab079a6128436dadef5b501d58e4ee580c3b725b667aa0
 MISC metadata.xml 1166 BLAKE2B 344379ff270c13113da4d40e916e8c16505653451d93fdc82ccbb9e0c39585863056030959579f310cb6ab9a01e058d929abc3c28f9886f32d086074dfe874d6 SHA512 60a33d86c244ce321427d325d4f1fb56846940a1ab2b6c965afb317c497b142644574b94bc715fd0d602628d8b07ba9690f5d0addad626163273cc1584ada370
diff --git a/games-rpg/coe2/coe2-2007-r1.ebuild b/games-rpg/coe2/coe2-2007-r2.ebuild
index 99a3f1b823f2..3ac7358ce27a 100644
--- a/games-rpg/coe2/coe2-2007-r1.ebuild
+++ b/games-rpg/coe2/coe2-2007-r2.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Precursor to the Dominions series"
 HOMEPAGE="https://www.shrapnelgames.com/Our_Games/Free_Games.html"
 SRC_URI="https://download.shrapnelgames.com/downloads/${PN}_${PV}.zip"
+S="${WORKDIR}"/coe
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist"
 
-RDEPEND="media-libs/libsdl[sound,video]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/coe
+DEPEND="media-libs/libsdl[sound,video]"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="app-arch/unzip"
 
 # bug #430026
-QA_PREBUILT="${GAMES_PREFIX_OPT}/coe2/coe_linux"
+QA_PREBUILT="opt/coe2/coe_linux"
 
 src_prepare() {
+	default
+
 	rm -r *.{dll,exe} old || die
 	if use amd64 ; then
 		mv -f coe_linux64bit coe_linux || die
@@ -31,25 +35,29 @@ src_prepare() {
 }
 
 src_install() {
-	insinto "${GAMES_PREFIX_OPT}/${PN}"
+	insinto /opt/${PN}
 	doins *.{bgm,smp,trp,trs,wrl}
 	dodoc history.txt manual.txt readme.txt
-	exeinto "${GAMES_PREFIX_OPT}/${PN}"
+	exeinto /opt/${PN}
 	doexe coe_linux
 
-	games_make_wrapper ${PN} "./coe_linux" "${GAMES_PREFIX_OPT}/${PN}"
+	make_wrapper ${PN} "./coe_linux" "/opt/${PN}"
 	make_desktop_entry ${PN} "Conquest of Elysium 2"
 
 	# Slots for saved games.
 	# The game shows e.g. "EMPTY SLOT 0?", but it works.
-	local f slot state_dir=${GAMES_STATEDIR}/${PN}
-	dodir "${state_dir}"
+	local state_dir=/var/lib/${PN}
+	dodir ${state_dir}
+
+	local f slot
 	for slot in {0..4} ; do
 		f=save${slot}
-		dosym "${state_dir}/save${slot}" "${GAMES_PREFIX_OPT}/${PN}/${f}"
-		echo "empty slot ${slot}" > "${D}${state_dir}/${f}" || die
-		fperms 660 "${state_dir}/${f}"
+
+		dosym ${state_dir}/save${slot} /opt/${PN}/${f}
+		echo "empty slot ${slot}" > "${ED}"/${state_dir}/${f} || die
+		fperms 660 ${state_dir}/${f}
 	done
 
-	prepgamesdirs
+	fowners -R root:gamestat /var/lib/${PN}/
+	fperms g+s /opt/${PN}/coe_linux
 }
diff --git a/games-rpg/comi/Manifest b/games-rpg/comi/Manifest
index 83dfbda879a2..7e0fc3c99a01 100644
--- a/games-rpg/comi/Manifest
+++ b/games-rpg/comi/Manifest
@@ -1,3 +1,3 @@
 DIST comi.jpg 5320 BLAKE2B 4729546c766536a5bb937c1e7eb3cd231ec44146fabda41326f5dbf0a3cb13b57f119a0d28283b1664bcd11ffb652606f0ee2f658d5a0701e5ad15f70a9e8b01 SHA512 b8042241b0badc6950cac8bf0eae7f5e138d5f3fc96f9d3a2108cd3bc69d972bbb12e8f3a416273f0763a1ecfee9b66daff69e211889cd93468439a3036817af
-EBUILD comi-1.ebuild 1476 BLAKE2B 82ff554800ab8b74301d6bca430ba057c62e10cfba4ea8fc2711c37a3144e121f55188fbfcec795323fce82a743d2f345a0b863ef94ec4c2481cc1b092d30059 SHA512 44851095403c5903cb2294617dcfb7c56f7536c00a53d2cb537392bfea7015a5cb82de67f093ee4cf41fef11c0c49ea605d99584ccc46838d3cb2665aa009b4b
+EBUILD comi-1.ebuild 1483 BLAKE2B d20f4a1bfdc02b288b3fdfc03e18ffef3143df4b043863711587ff00db77943a5e2206744336813faa5b306c2561c20f18dfaa99ece387a3de2eb784b3be5317 SHA512 6dd00f1bbb1424d9d540852696a11e9e0ae4b1be7ff29ad556b0c105be4a9e6f89caa563dcd7a192f7e857187d50ff833b0bda7bf52f0f800cf18479ceff1b13
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/comi/comi-1.ebuild b/games-rpg/comi/comi-1.ebuild
index 91a25419df7f..c236886050b8 100644
--- a/games-rpg/comi/comi-1.ebuild
+++ b/games-rpg/comi/comi-1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cdrom estack eutils xdg
+inherit cdrom estack desktop wrapper xdg
 
 DESCRIPTION="The Curse of Monkey Island, the third game in the series"
 HOMEPAGE="https://en.wikipedia.org/wiki/The_Curse_of_Monkey_Island"
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${PN}.jpg"
+
 LICENSE="${PN}"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/games-rpg/dear-esther/Manifest b/games-rpg/dear-esther/Manifest
index 8f69e7599203..5aa0f14a475c 100644
--- a/games-rpg/dear-esther/Manifest
+++ b/games-rpg/dear-esther/Manifest
@@ -1,3 +1,3 @@
 DIST dearesther-linux-06082013-bin 1007461686 BLAKE2B 0ffb2387490beef790ad00f110a8393bb69f0fe762799795a655eab748aed08eb8665c199ea0f588c764bafaa68eae3ba6884296614abbd66ecd1b72810b2c88 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e
-EBUILD dear-esther-20130608.ebuild 1555 BLAKE2B 8a38e82171731c3aaa579ebb835f84f21551c5274a4f59134a76036814314681dd865bd370a71b160427192502328c28445f7b32b45cdc3bfce43531c3510e6e SHA512 68f6c5b839fcca99cb0efc608f9d983aae5165a5bcba83baa93dd860605b9c34edb91d2db27da4160676d5f8be9c01e73ab509380374dad10cf2ff4ab7518e90
+EBUILD dear-esther-20130608-r1.ebuild 1476 BLAKE2B 41902cb17858901ae611cc83d0762cb04fbd5a245eaf9cafdba644cc99528e2fafa4849c84077602104f9f6fdf846be41a13be995e2bc65c8ebb3590340677e4 SHA512 d5a5520fb54bce5a1525d7e95a4f2db47aeaa87eeffe444491bc3005b52e9a003ec44b1ff8c128e67f2e80408995ce96c00feb1534caf761255e917ce02c13f1
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/dear-esther/dear-esther-20130608.ebuild b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
index 9786f2de6ba9..b2a07780a454 100644
--- a/games-rpg/dear-esther/dear-esther-20130608.ebuild
+++ b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
@@ -1,35 +1,37 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: unbundle libSDL2
+EAPI=7
 
-EAPI=5
-inherit eutils gnome2-utils unpacker games
+inherit desktop gnome2-utils unpacker wrapper
 
 TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 DESCRIPTION="Ghost story, told using first-person gaming technologies"
 HOMEPAGE="http://dear-esther.com/"
 SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
+S="${WORKDIR}"/data
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
 RESTRICT="bindist fetch splitdebug"
 
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/dearesther_linux
-	${MYGAMEDIR#/}/bin/*.so*"
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="
+	${MYGAMEDIR#/}/dearesther_linux
+	${MYGAMEDIR#/}/bin/*.so*
+"
 
-DEPEND="app-arch/unzip"
+# TODO: unbundle libSDL2
 RDEPEND="
 	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
 	>=media-libs/openal-1.15.1[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S=${WORKDIR}/data
+	virtual/opengl[abi_x86_32(-)]
+"
+BDEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
@@ -43,27 +45,23 @@ src_unpack() {
 }
 
 src_install() {
-	insinto "${MYGAMEDIR}"
+	insinto ${MYGAMEDIR}
 	doins -r bin dearesther platform dearesther_linux
 
 	doicon -s 256 dearesther.png
 	make_desktop_entry "${PN}" "Dear Esther" dearesther
-	games_make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
+	make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
 
 	dodoc README-linux.txt
 
-	fperms +x "${MYGAMEDIR}"/dearesther_linux
-
-	prepgamesdirs
+	fperms +x ${MYGAMEDIR}/dearesther_linux
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 5b2fe184b5cd..0f97ee50d6ed 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,4 +1,4 @@
 AUX egoboo-2.8.1-gentoo.patch 2233 BLAKE2B c2cf8754e956d1032461d9ee1ea6dae42e1969042647ec37bfc65f2fe702863386de406bfa35df76392bd38e65e10a9ec5956c84a83191fda767f53afee22121 SHA512 277e453c95ee908b064987eae732b37a6ee9c2d903532017eb8a8951458a16b5195694f8165ba7146b1ca609be6155e4df20212b8c3cb3b056c4249bc4f3e1f3
 DIST egoboo-2.8.1.tar.gz 150029960 BLAKE2B 582db0f3c033523f7b55e205aec5f7012301e3edb7a4667f49d6c4a26f99572b4652e3cf4b8ed0f9e4c4cf2f6129615a315955d0193f851fc7c16ab7eaf7e482 SHA512 5793a63ba90f461ae99bcb81bf4ddf287b203bc2d401e1f697f1f4f93e1d681954e09b23938eb1a36e7dd535e2d12b8882efd77572cc63392cad5f9462ac3054
-EBUILD egoboo-2.8.1-r1.ebuild 1254 BLAKE2B 93110e7e81f3df2960de016efb1da9b4aafdbf705727d287637b3ae880559561c0e7be806a75f7a395c89cecefce5b07333c95c30ab583c2777cd8d60d1d1990 SHA512 3ba98b1a1ed0a4af22dff6726ebc58e12c5cfca79575bc3f553ee9d196122803f5d870d0c7a93433ed46b6bf9733e4a553d82e9a44b98bf94e2e8d9e41ad5c01
+EBUILD egoboo-2.8.1-r1.ebuild 1257 BLAKE2B 61c1a97534213c00bf943d07d43cadcc0128ebe2e0e847485046e5451712c845750b8e07ab3832b2cd9cb632507505cee2b16e9a1d077210cc0cf266c1d1d717 SHA512 b3f00ccd715fd83c2dcde4cce7b4dde7996a8f0a09d60c2b14d00dde19fb3d5ba4eb84324310ce569b25a773c2d3f1891ff22a0095648fbf87c41c413941f438
 MISC metadata.xml 329 BLAKE2B e5d902b3bdacb0c6028e113c2617030dc6730c03b278cafc1ca077053ac9c9dc472d39a842fb18a506c979ae4f52dd21c1f4166f9e8f07289b8c66d6344c62a8 SHA512 c3152f5db54eb4ae254c36981adb9556ff0eb37b267cd1dd25efc1428249d826e4c37b6166034acf98229f6f3ac681d7edb9681c69fd2f88e9394dff04fbd5fb
diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
index 108aefdfcecc..f1770edacd10 100644
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+
+inherit desktop edos2unix
 
 DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	dev-games/physfs
@@ -22,7 +22,7 @@ DEPEND="
 	net-libs/enet:0
 	virtual/glu
 	virtual/opengl"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
diff --git a/games-rpg/hatoful-boyfriend-holiday-star/Manifest b/games-rpg/hatoful-boyfriend-holiday-star/Manifest
index 8440aab9e8d1..87168c91aaf1 100644
--- a/games-rpg/hatoful-boyfriend-holiday-star/Manifest
+++ b/games-rpg/hatoful-boyfriend-holiday-star/Manifest
@@ -1,3 +1,3 @@
 DIST Linux-Standalone-20151218.rar 347789456 BLAKE2B bb41ebcde9524f2259e9d9a69e19aedc2820ddcf5fe3f4f418f0bdf8cdc9bc228da8c38761febbd68d3ecef1c5f32a5a98fa70480930d9bbcd8285ee3f25c70a SHA512 c59c6d1b54ed59cecf0e7606bdedf25dfa97c8c658800bbf343282eb36b906a569a6f3614271a307008c9946e61abfa2868a1f5ba73193f13138d52333013f5b
-EBUILD hatoful-boyfriend-holiday-star-20151218.ebuild 1409 BLAKE2B f30fcaae1f4ef1ddc2e3c129f708047ef14877fd8bb29b0ac50553239947cf62055fa3f296541473c6502ca9d74dd6e586cd1d37f4b15676bf049fb47cad1f6a SHA512 ba983f4dd6b67b2b9cae9a527fe3b86da91f24fb4adbc7d5356ab0a198e6c9faa37c4a18db1fb59d4184f8fcadb5e4449984164e388b4ceac95ab703cb149af2
+EBUILD hatoful-boyfriend-holiday-star-20151218.ebuild 1411 BLAKE2B ab47a76c61e1756f96d82c41e30e3ed78a424b48db864334adc39ec1c78bd86ca3551f0cd9565252f8bbdcf28ffcdf0103e0362dc209fa9300fa5c7fe44f2e71 SHA512 4fce207f33f9b7b4337bbbd8c74a7b22c7675b0f812a9ca19f11b410423784194ef008d45ed650a7a2c1710b2b1632bee1fd88cf99de3217eddab7e5dc7e7ada
 MISC metadata.xml 354 BLAKE2B 620415356736dd403be27ef2547bd0d23a3812b3c16b7976125c582118af837336c258d7c0657dbe70b254ee773041f7e169939a34cc616870a5f54ad8429c31 SHA512 6ae66494681059ab163da720d574906da7db8facc7c383db8b8dd0d5ea78f41deb5f19389b1fd8fc2848cfb7ae5c11bd3ba2750a90799b382f0bfe8f70d48637
diff --git a/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild b/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild
index 8ed1e04ebf18..657a23662d56 100644
--- a/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild
+++ b/games-rpg/hatoful-boyfriend-holiday-star/hatoful-boyfriend-holiday-star-20151218.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop xdg-utils
+inherit desktop wrapper xdg-utils
 
 DESCRIPTION="Holiday-themed sequel to the Japanese visual novel and dating sim about birds"
 HOMEPAGE="https://www.devolverdigital.com/games/hatoful-boyfriend-holiday-star"
 SRC_URI="Linux-Standalone-${PV}.rar"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
diff --git a/games-rpg/pcgen/Manifest b/games-rpg/pcgen/Manifest
index 9b2cefe9d8e1..43f0a9c26a3e 100644
--- a/games-rpg/pcgen/Manifest
+++ b/games-rpg/pcgen/Manifest
@@ -1,3 +1,3 @@
 DIST pcgen-6.04.01-full.zip 68679438 BLAKE2B e9afa6b9937804988425d8d18cfed7728197ecc303f586ed899491e4d500eb0e6ddc0ae92aef1d4bfef7ff3fb987cca34af95246c83ebe71e089e3e5e91aa9dd SHA512 37e76e9bca3defe803459f898d3c51015cb4c4f69905c4179b78b1b26977b7d720ef413b3f5b2ef4252aa98f732075b9567c4f4822c61d169a5a0a6e2c78c0d4
-EBUILD pcgen-6.04.01-r1.ebuild 842 BLAKE2B d5d84e121027a78a3f4a61f86ada0ad7131364351afa76037824accdb759b98ea52e1fee918b14fb6dbaa134afe058f79b8e0c516e37703007bfa8314b6a45d8 SHA512 03ee28a1f12050b8cbbc1498a9f218983955ab6ecb2d5b10a60880bef6eb45eeb4032462b7afb733bcab705f18ffdcf68e5896a7d47b65d745b16665eb9800b6
+EBUILD pcgen-6.04.01-r1.ebuild 847 BLAKE2B 9baec67066489b94514db1ebdf575c4d05285d776ae8e48abf9d11271ec64bd3d6855ba8fa1984f6113110f934bc65505948d43a2ec65f233a50a0051d30ba4b SHA512 23bd92b3f73583776594e150906d499c077ffaa8d13d41923fa971755bb5acd7ef9c7a6c0da0a3aa67805bd2fa5304bc1c51d586ccf7fb5f3d443811904c9f70
 MISC metadata.xml 328 BLAKE2B 45ace1f30157cc4450f9dc90a24a7a6112a09fe61c1a17dca06b87d32fdbce9c7f704b36bb217da0371f71a8ff9b2ecdccbb63ad7b981587f61c33a3c4ef6adb SHA512 cd3e9ca2c51782031b89444cc5c3eda37537c04467753e9a6bd5c2e5357d5ba3077ed6aee0adeac6dd91c829c7fded3077fb8d39ab8e80d87e3dc62af5605cb7
diff --git a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild b/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
index 45e32d2039b7..4319ff1db634 100644
--- a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
+++ b/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2-utils
+inherit desktop gnome2-utils
 
 DESCRIPTION="D&D character generator"
 HOMEPAGE="http://pcgen.sourceforge.net/"
diff --git a/games-rpg/queen/Manifest b/games-rpg/queen/Manifest
index 8ddf6b94c23e..428c0f20f3f2 100644
--- a/games-rpg/queen/Manifest
+++ b/games-rpg/queen/Manifest
@@ -6,5 +6,5 @@ DIST FOTAQ_Talkie-1.1.zip 33744817 BLAKE2B bd6edb28de6c4bede38b3d41365a27ba75373
 DIST cat-queen.png 1099 BLAKE2B 4035d73ccecc0bf91c4411d6018682d11f3fb8a246718d3762b216d44e299e9c0f3c9325206e4ab2f454f3005af0197b027dbb85c6f772631c823ed032c6f040 SHA512 009f30e2f9abbc803cd47314d8ff53009898640c12a26cb155b7e0b29c0a2bdaa06cf97fca6ca6f8b428300d63ca8200f627695a3f0b71585374a4a2b63ed2df
 DIST queen-readme.txt 5351 BLAKE2B 8b1859540668102a1ac25019f824084393440dee080528aa98a92b205bc8bdba45649c062d7ad88f3c82645e186ed98c4628719295d0d8efb8147c095166999a SHA512 ed2b5bc18896f9eeadea7526a70ad0a115bda229d1074d8c3a5a64228a7089cc20c6e296d82dc482634ab9bde06a07635d10ee68f47420f00625e0f5c29ef6ad
 DIST queen.1.bz2 90404210 BLAKE2B d854e0d7b82cf06551ebef5dd8b44f99e4a924cdd5721894e1b09698e2bc790f591906bcaa5208e37f8f05773152c1da4edf3186080b5a1f279276b8dd112b45 SHA512 f931584c141403019dcd91c43c8610c23cf39b37272440517c75cd4946da005d7fabcdd76fce2ec7504f35ec02727bede7d6a98381bd4f0c6a8d65b3c4363278
-EBUILD queen-1-r1.ebuild 3342 BLAKE2B f75eb1f99e88f69de8616166d2f505c57cf782d2cbe7ff91a2b9294bc6f0d4ed1f563fae03bb94710a52d17dd57c52dca20b70c6119926cf3905f40c493e9806 SHA512 d12b85b68198bf5523e527b08ed8a9fbc7af92f07c8cbb020ace978bdcf48040ce20139c8b8ece65e0455b4631c24aad51d142fe4f96abded31b68941c0e2e0a
+EBUILD queen-1-r1.ebuild 3349 BLAKE2B eb32a791733af2ff9a6868d45c1885dfcb4b21745d8f39707c4574107665fa6efbbcfc15cdfdbfe39ad9c74e1c6f80bd35e629e318c9dd8b5b01dbd42e79e7c6 SHA512 db0a2679821a9447c2bcacea3ba79f07dbd84b3738d757a6ffa74d5f751f40406d391a186ded5b497a70fa87cb2843363c31de4e5fce33854f85337e8a837d9c
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/queen/queen-1-r1.ebuild b/games-rpg/queen/queen-1-r1.ebuild
index e9e011cf3398..9b38f5a10843 100644
--- a/games-rpg/queen/queen-1-r1.ebuild
+++ b/games-rpg/queen/queen-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=6
-inherit eutils
+
+inherit desktop wrapper
 
 DESCRIPTION="Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s"
 HOMEPAGE="http://scummvm.sourceforge.net/"
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
index 7c3440f08483..c15d236e7cf1 100644
--- a/games-rpg/to-the-moon/Manifest
+++ b/games-rpg/to-the-moon/Manifest
@@ -1,3 +1,3 @@
 DIST ToTheMoon_linux_1389114090.sh 75823678 BLAKE2B de63a8c5eff7d99f5af4fbc85c8e416c7bd7a07fad03dfb0424bf43f410bdbc9a0d064c8892dbb6c9fdc637391f2b2ef6ef40c72c501790ffec0aac8448add21 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a
-EBUILD to-the-moon-0.ebuild 2494 BLAKE2B 25b7033d023ca9fd495c2be87b240df7ef449f0f3950603ba376a1819c26458fb8c462f3771bfa9d2edd73d3d2da53c64039bd9170de301adfdac57bd5b00906 SHA512 414dd059e5ea14674c3800610336a5ce1fb1c64028d82111b441f226671c5cb3c9384589c736b1fb35500d2e8ce254cf84a26ca254380d165f1e15f5bc66fb24
+EBUILD to-the-moon-0-r1.ebuild 2423 BLAKE2B d9f921cfa744e4ad10134811a20b134aaead701367ba3747cdf2b50fe4010634ddef498271b1ef13343a4711080d34c668ba7e0f1393b382700d5b2245946e50 SHA512 5e5446a9abbbb7d2ee04f44f731bf4442e6d3d28d0ba6e6e126178e1ceb2fae36eb25362d1a4c0e313337676596a852ecd9eb892fcb6e6369f0439802c5b4849
 MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-rpg/to-the-moon/to-the-moon-0.ebuild b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
index b55f9b6f24f4..619cdd026667 100644
--- a/games-rpg/to-the-moon/to-the-moon-0.ebuild
+++ b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: unbundling sdl-sound breaks the game
-
-EAPI=5
+EAPI=7
 
-inherit eutils unpacker gnome2-utils games
+inherit desktop gnome2-utils unpacker wrapper
 
 MY_PN=ToTheMoon
 DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish"
 HOMEPAGE="http://freebirdgames.com/games/to-the-moon"
 SRC_URI="${MY_PN}_linux_1389114090.sh"
+S="${WORKDIR}"/data
 
 LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs"
+
 RESTRICT="fetch bindist splitdebug"
 
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin*"
+QA_PREBUILT="opt/${PN}/${MY_PN}.bin*"
 if [[ ${ARCH} == "amd64" ]] ; then
-	QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib64/*"
+	QA_PREBUILT="${QA_PREBUILT} opt/${PN}/lib64/*"
 else
-	QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib/*"
+	QA_PREBUILT="${QA_PREBUILT} opt/${PN}/lib/*"
 fi
 
+# TODO: unbundling sdl-sound breaks the game
 RDEPEND="
+	sys-libs/zlib
+	virtual/opengl
 	!bundled-libs? (
 		dev-libs/libsigc++:2
 		>=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video]
@@ -33,10 +36,11 @@ RDEPEND="
 		media-libs/sdl2-image[png]
 		media-libs/sdl2-ttf
 	)
-	sys-libs/zlib
-	virtual/opengl"
-
-S=${WORKDIR}/data
+"
+DEPEND="
+	sys-apps/coreutils
+	sys-apps/grep
+"
 
 pkg_nofetch() {
 	einfo
@@ -50,14 +54,16 @@ src_unpack() {
 	# mojo stuff inside makeself archive, unpack_makeself fails
 	local lastline=$(( $(grep -a -h -n -m 1 -F -e "Extra newline, because in very rare cases (OpenSolaris) stub is directly added after script" "${DISTDIR}/${A}" | cut -d':' -f1) + 1 ))
 	[[ ${lastline} ]] || die "no last line"
+
 	local offset=$(head -n ${lastline} "${DISTDIR}/${A}" | wc -c)
 	[[ ${offset} ]] || die "no offset"
+
 	dd ibs=${offset} skip=1 if="${DISTDIR}/${A}" of="${T}"/moon.zip || die
 	unpack_zip "${T}"/moon.zip
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 	local libsuffix=$(usex amd64 "64" "")
 	local arch=$(usex amd64 "x86_64" "x86")
 
@@ -74,20 +80,16 @@ src_install() {
 		doexe ${arch}/lib${libsuffix}/libSDL_sound-1.0.so.1
 	fi
 
-	games_make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}"
+	make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}"
 	make_desktop_entry ${PN} "To the Moon"
 	newicon -s 32 noarch/${MY_PN}.png ${PN}.png
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-rpg/vendetta-online-bin/Manifest b/games-rpg/vendetta-online-bin/Manifest
index 9c1e13605065..2cd79c13b546 100644
--- a/games-rpg/vendetta-online-bin/Manifest
+++ b/games-rpg/vendetta-online-bin/Manifest
@@ -1,5 +1,5 @@
 AUX vendetta 113 BLAKE2B 7f4afc48107ced2af51cb691d2c64229b717016bc81b997bbd6326d5e41f858202b713fb0c87b68938debefd593c56a52024d2827feec11c55c0126c876984fb SHA512 a6b21095a87585ce9e96e87941f651ce3a6bbb123bff7d49d3c00a9b7dbab9864151a00adcae168d9949a28e83a4057916091516278245cfa925111197096a95
 DIST vendetta-online-bin-1.8.296-amd64.sh 235822235 BLAKE2B d5b3218a6928da2f6b0ad8e12d7dbf7052140bb194aceee948ab89d019b59d361c8ddc7eff6d97cf361a9b9b99a7f1b1b8af91339245201203b9aa6d3c4a60ee SHA512 f57b8da6b2364df7ca78c0a8df66cadbc568927376548f95b49da5d641d49a155315583d4323599f59e982b0569b972311fa4717e11dab48e4da95ab235d05a4
 DIST vendetta-online-bin-1.8.296-x86.sh 235890404 BLAKE2B cb59204f54a60a42639e542527a7b07019c4d9873bd7b4027abede84f6e2ca321449dabdacb082d7fd3fce343de1db5039d4da8f230ee52a2c0d64b5d5c41cc0 SHA512 909e4960fe85c7bc71cf1530cd8fd9fa096b28c9ba621e3c16e14d1264858939e859fad182e76301322eb45b7c451bd21d87a90274eefb9e71e1fd1eb1f498b0
-EBUILD vendetta-online-bin-1.8.296-r1.ebuild 1403 BLAKE2B 20fbdb8d5f95bc94213b575c79786d8a0a80964bc6aa82ecece9f35ebf7dea3e5928065f5de5e3354b5eb125805df7970a496f810ba69b90986d4b313cfe3f07 SHA512 568ae9022583ad2038decfb4873799555c5b275816048c8436c604ffd0c75c751197021d3b3d2f24ec9fa34b0a6e91a18aa8ce756ef6c4e686b01445206971e2
+EBUILD vendetta-online-bin-1.8.296-r1.ebuild 1643 BLAKE2B 649ade45620f213efbfd748041f2c6cfdc3043045ad0e172b828f8b7e71d834a4dccfe4c2596dce3298d5533919459554cd7818e70ebabea0747e136668c221a SHA512 98c15c4c86ea826fef0a412b50580f8f7847597b575866d40f9343bf644c0a4dcae0c116fb4039fea81396d902e7a3314a1b018f47c63aa94c9b01c3025b01ce
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
index 8c863e4c4e78..16e36b6c3d8e 100644
--- a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
+++ b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
@@ -1,31 +1,44 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils unpacker
+EAPI=7
+
+inherit desktop unpacker
 
 DESCRIPTION="Space-based MMORPG"
 HOMEPAGE="https://www.vendetta-online.com"
-SRC_URI="amd64? (
+SRC_URI="
+	amd64? (
 		http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh
 			-> ${P}-amd64.sh
 	)
 	x86? (
 		http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh
 			-> ${P}-x86.sh
-	)"
+	)
+"
+S="${WORKDIR}"
 
 LICENSE="guild"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror strip"
 
-DEPEND="dev-util/patchelf"
-RDEPEND="virtual/opengl
-	x11-libs/gtk+:2"
+RDEPEND="
+	media-libs/alsa-lib
+	media-sound/pulseaudio
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:2
+"
+BDEPEND="dev-util/patchelf"
 
-S=${WORKDIR}
+QA_FLAGS_IGNORED="
+	opt/vendetta-online-bin/install/drivers/*.so
+	opt/vendetta-online-bin/install/update.rlb
+	opt/vendetta-online-bin/install/vendetta
+	opt/vendetta-online-bin/vendetta
+"
 
 src_unpack() {
 	unpack_makeself
@@ -36,8 +49,7 @@ src_prepare() {
 	default
 
 	# scanelf: rpath_security_checks(): Security problem with relative DT_RPATH '.'
-	for file in install/drivers/{gkvc.so,soundbackends/libalsa_linux_amd64.so,soundbackends/libpulseaudio_linux_amd64.so}
-	do
+	for file in install/drivers/{gkvc.so,soundbackends/libalsa_linux_amd64.so,soundbackends/libpulseaudio_linux_amd64.so} ; do
 		patchelf --set-rpath '$ORIGIN' $file || die
 	done
 }
@@ -45,9 +57,9 @@ src_prepare() {
 src_install() {
 	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r *
-	fperms +x "${dir}"/{vendetta,install/{media.rlb,update.rlb,vendetta}}
+	fperms +x ${dir}/{vendetta,install/{media.rlb,update.rlb,vendetta}}
 
 	sed \
 		-e "s:DATADIR:${dir}:" \
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index e4d91f02e623..40a6e2e1bfce 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1,3 +1,3 @@
 DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
-EBUILD wasteland2-1.9.0.13.ebuild 2048 BLAKE2B d81fbb9360dbe8db0b136d6426359c5dd9ffe762d49007697e0a6d0361d9a4e4f5efc67935395a306a0722d24bb8ebdf6d067e682e73a57fbae8584a18ca637d SHA512 00260bb194578f39fda2249aa030ac3f50e84a61f08c0cdf801bd1791250c305e83175b29a99e7b7c76ddb46e1e2a8ccbafa757ecaa1ab35d76442e5a6364339
+EBUILD wasteland2-1.9.0.13-r1.ebuild 1945 BLAKE2B 19714595fe7c1280a3bada785989138e50b6eb45a389b3078688730c2460dba1892a1fbcc384a08e56e747781ed87d5c8b6faf4718ad9bcc60c04b2b63d59fd8 SHA512 f0fca084083d7d1d43ce4611f5216ec1128093b7f226fdf63a700fad169d0014817130f237fa92f4c1848e65835f681c67c460a791ec82285f3be953ec417e3f
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild
index b8ddb7e9b2e9..2dffd54fb060 100644
--- a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
+++ b/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils gnome2-utils check-reqs games
+CHECKREQS_DISK_BUILD="22000M"
+CHECKREQS_DISK_USR="21600M"
+inherit check-reqs desktop gnome2-utils wrapper
 
 DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
 HOMEPAGE="https://wasteland.inxile-entertainment.com/"
 SRC_URI="gog_wasteland_2_${PV}.tar.gz"
+S="${WORKDIR}/Wasteland 2"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="bindist fetch mirror"
 
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/*"
+QA_PREBUILT="opt/${PN}/*"
 
 RDEPEND="
 	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
@@ -34,11 +36,6 @@ RDEPEND="
 	virtual/opengl
 "
 
-S="${WORKDIR}/Wasteland 2"
-
-CHECKREQS_DISK_BUILD="22000M"
-CHECKREQS_DISK_USR="21600M"
-
 pkg_nofetch() {
 	einfo
 	einfo "Please buy Wasteland 2"
@@ -53,30 +50,26 @@ pkg_nofetch() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 
 	# over 20GB of data
-	dodir "${dir}"
-	mv game/WL2_Data "${D%/}${dir}"/ || die
-	exeinto "${dir}"
+	dodir ${dir}
+	mv game/WL2_Data "${ED}/${dir}"/ || die
+	exeinto ${dir}
 	doexe game/WL2
 
-	games_make_wrapper ${PN} ./WL2 "${dir}"
+	make_wrapper ${PN} ./WL2 "${dir}"
 	newicon -s 256 support/gog-wasteland-2.png ${PN}.png
 	make_desktop_entry ${PN} "Wasteland 2"
 
 	dodoc docs/*.pdf
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
index bfb57e535012..0202d4cc2e4b 100644
--- a/games-rpg/xu4/Manifest
+++ b/games-rpg/xu4/Manifest
@@ -5,5 +5,5 @@ AUX xu4-0.9-zip.patch 4980 BLAKE2B 761a3251b23a22c3b1bc445a6cdc5a90f5ebe374dabd2
 DIST u4upgrad.zip 632072 BLAKE2B 3691f1cbac940021ef6043dd5e2ee26dcee5f8d7181ed525179211a6984f5ab498b84533d28146129c3e747f0af8946f7d691b7cb817a5a4ecb39e71e2df7b9a SHA512 4832d8cfd266d3ccc5eab5184bd2b6b9acd4c0203478873fb5e11704d95104dd9285a7752bad77f873d4f8603673184ae9421964509b948ec69944a4ceadd083
 DIST ultima4-1.01.zip 537487 BLAKE2B 9af5c934e57d3b0151a575efc3ed34fa25f81ed2c43e2cb95ee200afb1b2f49365634199e066787de3d20c4c97903f918de2a4d4f2e9aeeb361ee585e59fbbc1 SHA512 c86c29d51e21b93992316552fbaaec948e7e8048fea484f003f43ac82211f82fa587fb15db991cddf744f2c3ff0fc4d411cd51cc7650e13a5b520c4dc620518c
 DIST xu4-0.9.tar.gz 320090 BLAKE2B 298a97edd2c42edcc2f63ec99656e76f3c541fce13f01a0767f02f63223e0d842a33ee1012742b7cd5bdefa7c66cddba6799130f539a8bb306c87ece8585ea62 SHA512 6c0b27472074d96a5f76e024c800bed89c57c29dbd760278c819ad8b024362480bda5f1584eb9fe64fd6f6cae0b3b8d8571c8cf533f25b842471803acd7cea8d
-EBUILD xu4-0.9-r1.ebuild 1664 BLAKE2B b6cdc4c4b22521b2a8892b55965aa5daa74a2654c58aeb718372dc1bfd27eb9d036ba5c855947dc0d911a1bfacf8c5ff4922524e0912e6b4ce64eedc8a2f2cd2 SHA512 558b73be5403e28590790461f416cd7179dd57ea6303a5cc55de678eaefb9bb40f394a04bc1e836219f165eb172f6fddff15213fb17b344ff52032c635bb12c1
+EBUILD xu4-0.9-r1.ebuild 1646 BLAKE2B 460debf76568c1c1095a1e4f1e312c1d64c35a26b8f6d47a6ad2157c92811d8ea7a2bf6ece5fe6a70b6785ebccdf26f08ce6a21b533784c5cea188c575ec8d3f SHA512 204e3feb044cc50565806beb4a943421f2f42b4a7f9ea8709e9b0e96aac2a74041fff6637ef25f9cdfcd06ec0f48f2149dabcb54459a51c9d8df1b8e904ea976
 MISC metadata.xml 326 BLAKE2B c34bb1f21e6b7a60bb30b7bb3196af118f53137fcfd6508c3bc84c6abd1f62d53c1f43e72a1816c86f982f6f49b7dfa774647d1f42fc6ab696479b1ad645f9a9 SHA512 cdeb23df21e2a0ad4994adffe0ecf7fdca9fb886b6afc13483a80ffd481c9a031c2039894c86693b1ecf9652f882c2816e7091a3d6dd9ad76013b563e8780ec3
diff --git a/games-rpg/xu4/xu4-0.9-r1.ebuild b/games-rpg/xu4/xu4-0.9-r1.ebuild
index 69fd4ed87d0b..744dd0e7d8cd 100644
--- a/games-rpg/xu4/xu4-0.9-r1.ebuild
+++ b/games-rpg/xu4/xu4-0.9-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 DESCRIPTION="A remake of the computer game Ultima IV"
 HOMEPAGE="http://xu4.sourceforge.net/"
diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest
index b0c2274e08a8..e705a320ac5b 100644
--- a/games-rpg/zsdx/Manifest
+++ b/games-rpg/zsdx/Manifest
@@ -1,3 +1,3 @@
 DIST zsdx-zsdx-1.9.0.tar.gz 20760682 BLAKE2B 7063b7bc34a03c5e1879eaae78d28dcf28ae9799eed2ef2b4422f3fad709234ae6ebb67f641d76df370b27b72eb6f9ed6d611b8bead37b87287637cb28b072cb SHA512 673a7db1dadfae09df23b189b9e18af1182cb731897e4067f47867387c04b21308991116c6f840cb228adee9c459565c2f5e6f1a01e885ea23c00347d4d64540
-EBUILD zsdx-1.9.0-r1.ebuild 1136 BLAKE2B d5f5350b45db9affff5c685f542a2686d89bb7508e55714a6741059a52922773f1ad8b0e664aff46abbd0e626f80744ce9b0febfa3b0e54801e0996bacc9b3c1 SHA512 93406617f8762a1a6a24a0331d61856451fc7fcf2fef2d33ad2e539529fabe9ecf5933ada5418ea72ff9e4625efecc807785729ec99663440ac632f6b769f34c
+EBUILD zsdx-1.9.0-r1.ebuild 1137 BLAKE2B 3fedf796a19d0b1e5fc243483c4d56a9080f0a9c79bf8d89c088daeb10f622e47820ad7272f9eb0d1473fba599a1517f3f0c1f7554e58d216726419d64330f7e SHA512 27979053cad09080fbe4de9cc6392e4e9b90411ee1597e9713a293e4ab8d0e7440c19aeb7787607bfd5096e027e0fb8840f0df05a57d22a3f540b6942db90eec
 MISC metadata.xml 333 BLAKE2B 34c8b3d3b3ef4c78241d40bd05613959e3d541561f6973c47c57489b0eea0e84ef21909fcb21102bdb4b5eaf0b8051c075a9649fe0975ead3c4cd1ff4c1471f7 SHA512 8135204b08f68188a8dc178b3083600e01a860b043cbc26415a111f6b23030cc067754dff74d77ac476e757caece3d44688f12126e81c17eaff74e4840f59ec9
diff --git a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
index ac6267f86cb6..4b05d8e37e66 100644
--- a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
+++ b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake desktop xdg
+inherit cmake desktop wrapper xdg
 
 DESCRIPTION="Free 2D Zelda fangame"
 HOMEPAGE="https://www.solarus-games.org/"
@@ -14,14 +14,13 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
 LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror"
 
 RDEPEND="
 	>=games-engines/solarus-1.3.0
 	<games-engines/solarus-1.4.0
 "
-DEPEND="app-arch/zip"
+BDEPEND="app-arch/zip"
 
 DOCS=( ChangeLog readme.txt )
 
diff --git a/games-rpg/zsxd/Manifest b/games-rpg/zsxd/Manifest
index 3251ad53e721..00d58cca32c5 100644
--- a/games-rpg/zsxd/Manifest
+++ b/games-rpg/zsxd/Manifest
@@ -1,3 +1,3 @@
 DIST zsxd-zsxd-1.9.0.tar.gz 3690390 BLAKE2B c5b6a671c5b5f8ba702ba23f447c0858aa870730a752761f65092b8e1f4a0879f2877fabf0e52a71be380ff25628f0be94f01f6a02009bfe4f7d1952f50ba5f4 SHA512 a457374adc7a8f4b7872b6f6693051d1499320f4349d55009e581132b62f5eebd6e35cc80c1ac14c5c80b74145fb7ac26b312f3f329df71c36e71d9a38383f05
-EBUILD zsxd-1.9.0-r1.ebuild 1154 BLAKE2B cc093c3a0bcf6bf60a90de29a2368a71a5e12ea9c9d55099da6f1593f7213f9579ad4874470de35f00c01b911275382549ee1b770f8fcf1df06268b830888ba4 SHA512 4de13ed1924b8a55d2217986aafea1f319f5b327ead84b3a973b5d7588bfb9118d551660db50c055c5f87107f92d344ce7b4318d187f61fae39b34c4a4d55f87
+EBUILD zsxd-1.9.0-r1.ebuild 1155 BLAKE2B 2732b6a3f25a46564a78426c0e9798cee16bac180b3f30013aaddc1d60a463e063d126db01cde740431c3d9fee65db9b8b5aca8f8fed569e3fb7f418eb108242 SHA512 74dcbf755be63e6f64878d7b100e0b3a2175681753db883a9e6107ade57a2f0885d2a7bb8c9b98f3b317342838d9598fcc96b456f927420418f4a1952b561a8a
 MISC metadata.xml 333 BLAKE2B 81d8a164a8319a24109c072f73e7959380cee2aef798b0ccceb6100825abfe51a6267f1e4f44da5c5ad4ec8881a36e09ac0a38187d936924e0ee85ebe59ee274 SHA512 bb078fd150a98e9326870e54347db0f9962d1f00707d7dcae5814808946e1ca673c45073d9bf886d6cb1d456e3ece9a236c6bb1b8448c3b9d9ef583acdf731f4
diff --git a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
index b8e0195e4681..ea879c3b692d 100644
--- a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
+++ b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake desktop xdg
+inherit cmake desktop wrapper xdg
 
 DESCRIPTION="Free 2D Zelda fangame parody"
 HOMEPAGE="https://www.solarus-games.org/"
@@ -14,14 +14,13 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
 LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist"
 
 RDEPEND="
 	>=games-engines/solarus-1.3.1-r1
 	<games-engines/solarus-1.4.0
 "
-DEPEND="app-arch/zip"
+BDEPEND="app-arch/zip"
 
 DOCS=( ChangeLog readme.txt )