From b1c81de4fadbd00897700a7321f03b390d952b2e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 26 Aug 2021 00:09:36 +0100
Subject: gentoo resync : 26.08.2021

---
 games-arcade/Manifest.gz                           | Bin 20898 -> 20924 bytes
 games-arcade/aquaria/Manifest                      |   2 +-
 games-arcade/aquaria/aquaria-1.1.3-r2.ebuild       |  51 ------------
 games-arcade/aquaria/aquaria-1.1.3-r3.ebuild       |  52 ++++++++++++
 games-arcade/barbarian-bin/Manifest                |   2 +-
 .../barbarian-bin/barbarian-bin-1.01-r2.ebuild     |  53 -------------
 .../barbarian-bin/barbarian-bin-1.01-r3.ebuild     |  53 +++++++++++++
 games-arcade/emilia-pinball/Manifest               |   2 +-
 .../emilia-pinball/emilia-pinball-0.3.1-r2.ebuild  |  76 ------------------
 .../emilia-pinball/emilia-pinball-0.3.1-r3.ebuild  |  76 ++++++++++++++++++
 games-arcade/gunocide2ex/Manifest                  |   2 +-
 games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild |  88 ---------------------
 games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild |  88 +++++++++++++++++++++
 games-arcade/jardinains/Manifest                   |   2 +-
 games-arcade/jardinains/jardinains-2.0-r2.ebuild   |  72 -----------------
 games-arcade/jardinains/jardinains-2.0-r4.ebuild   |  72 +++++++++++++++++
 games-arcade/pachi/Manifest                        |   2 +-
 games-arcade/pachi/pachi-1.0-r1.ebuild             |  50 ------------
 games-arcade/pachi/pachi-1.0-r2.ebuild             |  50 ++++++++++++
 games-arcade/shovel-knight/Manifest                |   2 +-
 .../shovel-knight/shovel-knight-3.3.ebuild         |   8 +-
 games-arcade/tomatoes/Manifest                     |   2 +-
 games-arcade/tomatoes/tomatoes-1.55-r3.ebuild      |  75 ------------------
 games-arcade/tomatoes/tomatoes-1.55-r4.ebuild      |  75 ++++++++++++++++++
 games-arcade/xbill/Manifest                        |   2 +-
 games-arcade/xbill/xbill-2.1-r3.ebuild             |  48 -----------
 games-arcade/xbill/xbill-2.1-r4.ebuild             |  49 ++++++++++++
 games-arcade/xgalaga/Manifest                      |   2 +-
 games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild     |   2 +-
 games-arcade/xjump/Manifest                        |   2 +-
 games-arcade/xjump/xjump-2.7.5-r1.ebuild           |  63 ---------------
 games-arcade/xjump/xjump-2.7.5-r2.ebuild           |  63 +++++++++++++++
 32 files changed, 592 insertions(+), 594 deletions(-)
 delete mode 100644 games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
 create mode 100644 games-arcade/aquaria/aquaria-1.1.3-r3.ebuild
 delete mode 100644 games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
 create mode 100644 games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild
 delete mode 100644 games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
 create mode 100644 games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild
 delete mode 100644 games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
 create mode 100644 games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild
 delete mode 100644 games-arcade/jardinains/jardinains-2.0-r2.ebuild
 create mode 100644 games-arcade/jardinains/jardinains-2.0-r4.ebuild
 delete mode 100644 games-arcade/pachi/pachi-1.0-r1.ebuild
 create mode 100644 games-arcade/pachi/pachi-1.0-r2.ebuild
 delete mode 100644 games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
 create mode 100644 games-arcade/tomatoes/tomatoes-1.55-r4.ebuild
 delete mode 100644 games-arcade/xbill/xbill-2.1-r3.ebuild
 create mode 100644 games-arcade/xbill/xbill-2.1-r4.ebuild
 delete mode 100644 games-arcade/xjump/xjump-2.7.5-r1.ebuild
 create mode 100644 games-arcade/xjump/xjump-2.7.5-r2.ebuild

(limited to 'games-arcade')

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index ea30399fc7d4..772b23a88202 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/aquaria/Manifest b/games-arcade/aquaria/Manifest
index af6052ab7666..3d4609e0f0e8 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-r2.ebuild 1068 BLAKE2B ce66606a8e5428d530430ba15e7b2ab60d0a19b818a2ac7f8ebe5d66836bb5e11458191c8b74812744fba35164887a454b3f9e296d38e9a9cf05498fa7371de2 SHA512 6092195177c6577c8d0492e9b532590cde927b8c06d9d61487993d28a5e9cc0a68bbf68b7ba065ac0c291ff25f11d8cb9d5909bc0343b0b61433af1a3ce30b1e
+EBUILD aquaria-1.1.3-r3.ebuild 1070 BLAKE2B 09e116e2473c5a9c1cb7b65315c9871f3253f048213ce5caa486ffc2430f48b8358195eab4ca079ad7d35b9e3f6b0932ef9f418d70eb9205f74f990981c94416 SHA512 0cedb9f0f4a913ca86a79c94ac46ecca24c86a588ed2ed242a147e787e27297ac82ebc338859969f45398a6338099933af20a40210f0f2b53cff3f839c67c791
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
deleted file mode 100644
index e1fb8b150c63..000000000000
--- a/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-RESTRICT="strip fetch bindist"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
-BDEPEND="app-arch/unzip"
-
-dir=opt/${PN}
-QA_PREBUILT="${dir#/}/aquaria"
-
-pkg_nofetch() {
-	echo
-	elog "Download ${SRC_URI} from ${HOMEPAGE} and place it into"
-	elog "your DISTDIR directory."
-	echo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto ${dir}
-	exeinto ${dir}
-
-	doins -r *.xml */
-	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
-
-	make_wrapper "${PN}" "./${PN}" "${dir}"
-	make_desktop_entry "${PN}" "Aquaria"
-}
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..c052fc1b10ad
--- /dev/null
+++ b/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+RESTRICT="strip fetch bindist"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
+BDEPEND="app-arch/unzip"
+
+dir=/opt/${PN}
+QA_PREBUILT="${dir#/}/aquaria"
+
+pkg_nofetch() {
+	echo
+	elog "Download ${SRC_URI} from ${HOMEPAGE} and place it into"
+	elog "your DISTDIR directory."
+	echo
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	insinto ${dir}
+	doins -r *.xml */
+
+	exeinto ${dir}
+	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
+
+	make_wrapper "${PN}" "./${PN}" "${dir}"
+	make_desktop_entry "${PN}" "Aquaria"
+}
diff --git a/games-arcade/barbarian-bin/Manifest b/games-arcade/barbarian-bin/Manifest
index e3ea2902ca8e..c496c31f5454 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-r2.ebuild 1315 BLAKE2B 335419fd3f6b4eded4d986a4e55a7e110741ff6988d3838e213543dc29c5cf3addcc4fa6a3924728c12af8310da2efb75c0c46969db4ee94c6887163cf40689d SHA512 571996903576cd1edab8cb5adf22a96dbaeec739344d3a45166d8fea0d2d5f623a4bc6a9d6e9ae563a81e1412826e0734f399fe43adff7d6e4cae3b7755c2b7f
+EBUILD barbarian-bin-1.01-r3.ebuild 1343 BLAKE2B 013fcb0c7aacdcdea4b0cf46de217c37fcbaa84a0d91cb037c56499fb50f3d07e10bd1190af46abe89d0e672588b619b9c9f453a22fc6ea2da6e435dff101a8a SHA512 20070dff9186c47b5ce05512fdd70f9bd712b1a297cdccff6fca8217f055dd84412c43d5e9f4e5fa00dab13d5420b302b90a0061ca08c3b7222176de203c5164
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
deleted file mode 100644
index c7f7f26b27fe..000000000000
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/barbarian-bin/barbarian-bin-1.01-r3.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild
new file mode 100644
index 000000000000..6f60c21567e9
--- /dev/null
+++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.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 /opt/${MY_PN}/heroes.hoh
+
+	fperms 660 /var/games/${PN}/heroes.hoh
+	fowners -R root:gamestat /var/games/${PN} /opt/${MY_PN}/Barbarian
+	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/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index b9488306c57c..063776743d2b 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -3,5 +3,5 @@ AUX emilia-pinball-0.3.1-glibc210.patch 383 BLAKE2B 3d4eaf146dcef5dacbc1e61d667a
 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-r2.ebuild 1401 BLAKE2B e49ed85390c012c546176f670a73ba0fdab545abbf222f92f64fb0d658a07998fb16e0eb13b360afff3611c332690f565189bb20a8144b8621ea9cc28cbe43fc SHA512 ecc2a81fef12517337e8162aa8993f145625c807267fb7bd623bc8a89b612db82ccae7c55296ce92bc56c299e93f712919544115eb4251ea03a6f666ef237155
+EBUILD emilia-pinball-0.3.1-r3.ebuild 1418 BLAKE2B ffc54459ea68ed950c416dcdedbcb9ddb656d35ec08af8c0cdc0836410e02afb0462c7d4bf10d71ba6d20d7548ba276a44cef448080484cf135b3e655de1c8e2 SHA512 6ddcdd743475849876969feca4d16d2f7bfb3ac9aaf60a04229b63d1edc93e8cc92a2485b808af006f4c6bdeba6104aca040d98b947fdb64468bb30cea142620
 MISC metadata.xml 330 BLAKE2B 7deaad70c752f4c41009dfd6ec073f972e9ee484d4497c0b23d184cd48bdb5aaa45f2644c412ab2a885aea6655e1a737a612bb65b3d8147272f63a2de932825c SHA512 8432311fd9fb74150e0571245c2afda26de63a3a3671905cb7f221984933e5971c1f5f355517c54b7c31de3a3d3349d06116a4e67c57c44489147af5ae80e8cf
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
deleted file mode 100644
index 523439876ec8..000000000000
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	media-libs/libsdl[joystick,opengl,video,X]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	x11-libs/libICE
-	x11-libs/libSM
-	virtual/opengl
-	virtual/glu
-"
-DEPEND="
-	${DEPEND}
-	x11-libs/libXt
-"
-
-RDEPEND+=" acct-group/gamestat"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc210.patch
-	"${FILESDIR}"/${P}-libtool.patch
-	"${FILESDIR}"/${P}-gcc46.patch
-	"${FILESDIR}"/${P}-parallel.patch
-)
-
-src_prepare() {
-	# bug #334899
-	sed -i -e '/dnl/d' {src,test}/Makefile.am || die
-
-	default
-
-	rm -rf libltdl || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-x
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	default
-
-	dosym pinball /usr/bin/emilia-pinball
-
-	sed -i \
-		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
-		"${ED}"/usr/bin/pinball-config || die
-
-	newicon data/pinball.xpm ${PN}.xpm
-	make_desktop_entry emilia-pinball "Emilia pinball"
-
-	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/emilia-pinball-0.3.1-r3.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild
new file mode 100644
index 000000000000..2e0de0e6e743
--- /dev/null
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	media-libs/libsdl[joystick,opengl,video,X]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	x11-libs/libICE
+	x11-libs/libSM
+	virtual/opengl
+	virtual/glu
+"
+DEPEND="
+	${DEPEND}
+	x11-libs/libXt
+"
+
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc210.patch
+	"${FILESDIR}"/${P}-libtool.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-parallel.patch
+)
+
+src_prepare() {
+	# bug #334899
+	sed -i -e '/dnl/d' {src,test}/Makefile.am || die
+
+	default
+
+	rm -rf libltdl || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-x
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	default
+
+	dosym pinball /usr/bin/emilia-pinball
+
+	sed -i \
+		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
+		"${ED}"/usr/bin/pinball-config || die
+
+	newicon data/pinball.xpm ${PN}.xpm
+	make_desktop_entry emilia-pinball "Emilia pinball"
+
+	fperms -R 660 /var/games/pinball
+	fowners -R root:gamestat /usr/bin/pinball /var/games/pinball
+	fperms g+s /usr/bin/pinball
+}
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index 82405816c24e..dd88e7fe81de 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,5 +1,5 @@
 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-r2.ebuild 1755 BLAKE2B 4e79dadaf8ac3529255e46fe40ede39d18b159ba47067978f2a42914711fba1cefa6a602b53218bc775bd4ea175862aaa1d07a51d039e86354bca6616dd60d25 SHA512 474509fc044634c28e5cf243489a116dd077de67042fe7eb0b08cb8508ee5e53aee06704354bb3d1f118c7893c6e52945f5e7dbdcdae27b97e58bb9609435b56
+EBUILD gunocide2ex-1.0-r3.ebuild 1769 BLAKE2B 129567cae83f7125f80955ac75f2c994e55ac58c0f2af5516c21345b61bc466ca4b3173daac80c745f716fddf2390095d6896fa3a470e54b4316439516c70b24 SHA512 21976e04da8b6dfcc8b543d403e405a75dc8cfd657cdfba4c2a5f46433cb9e71cbb6bd298d4c53d937736099c5f844d413deed514ce9ac0b8830cf23acad9b27
 MISC metadata.xml 327 BLAKE2B 78befc8fb90a335e458fc40d096a8dd59c04da0c72b039f7ad816d37693558514d77a40f9bbec5966aa611d2f323a1e12ac44b2dcefda015260e669f3e622887 SHA512 0ad645742ce134798ac8178d859ccdeedc9b060f7d5065b825ac9c9158130e7221c068264ce82e95f066294c045a9440a9aca241484115057ad3a709afad905f
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
deleted file mode 100644
index 920de2e8b41e..000000000000
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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-r3.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild
new file mode 100644
index 000000000000..b13817223bfb
--- /dev/null
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.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} /usr/bin/g2ex
+	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/jardinains/Manifest b/games-arcade/jardinains/Manifest
index 8951d2015ad0..48b937c6884a 100644
--- a/games-arcade/jardinains/Manifest
+++ b/games-arcade/jardinains/Manifest
@@ -1,4 +1,4 @@
 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-r2.ebuild 1598 BLAKE2B 64d1e8e705751c468b3cba514fb241ed8d24cb2fd78b0b2981d4062a37970c3942e17b32e8d3c0db2ac4750f76300640f6b78e83306eecc2be586504c2c855e7 SHA512 ee2851e0aca250af4c69fd2963e79e464f3693c4eb5de821602a7669fe5004c166849fc0cb51a91c4a9d701d3b09ccf26c0e4786dd158b917749b42cd192a4dc
+EBUILD jardinains-2.0-r4.ebuild 1622 BLAKE2B 561c28e709cac74bb71adc66b77a130dae64477c4dd7084295788555026831d33a0bc470079f0118ddb360f383a4df36e51209eedccc73b14a36bf99b01147a8 SHA512 9f765c7611a26bf944eaa352e1f5727c2243f46a32425265d782de0e6bc8681fc9cf9329ad0bd8fc70b80ff5bbd542434bf3bf8b2f3f6ad23894e7b503735db3
 MISC metadata.xml 620 BLAKE2B d7544b15c6c62f4c3d1694e30afb4bf4a7a23402d83a594f35ab1f16a7eef3046121656ded24364b6e09dc93e98c17558e1ecc2e60e19edb6b8db6e95b2f00fd SHA512 4400b85a7b410885b2528a18cde41b35cd4a4034e5aecf2f1ad26c0300ed5d8e4bb01646d5be30f9c198d4d70b0bb9cc45bf52f7664cb9a51c3d704a56fa25b5
diff --git a/games-arcade/jardinains/jardinains-2.0-r2.ebuild b/games-arcade/jardinains/jardinains-2.0-r2.ebuild
deleted file mode 100644
index 177944be5b6e..000000000000
--- a/games-arcade/jardinains/jardinains-2.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-DESCRIPTION="Arkanoid with Gnomes"
-HOMEPAGE="http://www.jardinains2.com"
-SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
-
-LICENSE="jardinains"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="strip"
-QA_EXECSTACK="opt/jardinains/jardinains"
-
-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(-)]
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-"
-
-dir=opt/${PN}
-QA_PREBUILT="${dir}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/strings-pt.patch
-)
-
-src_unpack() {
-	unpack JN2_1_FREE_LIN.tar.gz
-	cd "${WORKDIR}" || die
-	mv "Jardinains 2!" ${P} || die
-}
-
-src_prepare() {
-	default
-
-	# clean Mac fork files (bug #295782)
-	find . -type f -name "._*" -exec rm -f '{}' + || die
-}
-
-src_install() {
-	exeinto ${dir}
-	doexe jardinains
-
-	insinto ${dir}
-	doins -r LICENSE.txt data help
-
-	make_wrapper jardinains ./jardinains "${dir}" "${dir}"
-	make_desktop_entry jardinains "Jardinains 2"
-	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() {
-	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."
-}
diff --git a/games-arcade/jardinains/jardinains-2.0-r4.ebuild b/games-arcade/jardinains/jardinains-2.0-r4.ebuild
new file mode 100644
index 000000000000..e4943e1e457b
--- /dev/null
+++ b/games-arcade/jardinains/jardinains-2.0-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="Arkanoid with Gnomes"
+HOMEPAGE="http://www.jardinains2.com"
+SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
+
+LICENSE="jardinains"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="strip"
+
+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(-)]
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+
+dir=/opt/${PN}
+QA_PREBUILT="${dir#/}/${PN}"
+QA_EXECSTACK="${dir#/}${PN}/jardinains"
+
+PATCHES=(
+	"${FILESDIR}"/strings-pt.patch
+)
+
+src_unpack() {
+	unpack JN2_1_FREE_LIN.tar.gz
+	cd "${WORKDIR}" || die
+	mv "Jardinains 2!" ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# clean Mac fork files (bug #295782)
+	find . -type f -name "._*" -exec rm -f '{}' + || die
+}
+
+src_install() {
+	exeinto ${dir}
+	doexe jardinains
+
+	insinto ${dir}
+	doins -r LICENSE.txt data help
+
+	make_wrapper jardinains ./jardinains "${dir}" "${dir}"
+	make_desktop_entry jardinains "Jardinains 2"
+	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 /opt/${PN}/jardinains
+	fperms g+s /opt/${PN}/${PN}
+}
+
+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."
+}
diff --git a/games-arcade/pachi/Manifest b/games-arcade/pachi/Manifest
index 8641ab0f5290..f164e5aadc4d 100644
--- a/games-arcade/pachi/Manifest
+++ b/games-arcade/pachi/Manifest
@@ -1,4 +1,4 @@
 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-r1.ebuild 1088 BLAKE2B 23c93592b2c603473f5a5588f93fa8da6765c515a9e95bb24fde5b51d70b418e28812471981083ef51d3a399da331e63bffbec640cff2115cd52382cdca1119e SHA512 fe799267b62024ce3800163a09de45dcb5a90c124e5eec445ff63a2909e080d1acf20d7d5be19579dfe46c5a3e896c9d1ffc0594d14211e3807f6cd15bda52dd
+EBUILD pachi-1.0-r2.ebuild 1103 BLAKE2B 2c239902702dc09f01efdef339c06c74753db5ef0fe9d5b29fca18ab46a70fb65dd5e059fa7f4a92ebc4eca2ea2f26897844166a5f8a77ef2515f0c07a02407d SHA512 c74daa86012725b439e7af51368a87387a240e6558cc06391bf0142da771fa3bf9b143df219d3beae4eb1f7db95791a14457fe4bbcb78c5b771ce2476862603d
 MISC metadata.xml 333 BLAKE2B e14155543715b12b61b84d111606a7630315a349d0ad1ed68a4323ec50ff225f6cd9ed3a3bbc980e1246982bb25444884a1e63386c9526d31fb7b31b28f95892 SHA512 9f7e4e3994f529f9905dcf550cfb3ab0a4f0998a689a52e34d1bb2b5916273e7827937900606316cdd465e90752ab5a1bd0cf248f6288fc3d1be3f3d35982567
diff --git a/games-arcade/pachi/pachi-1.0-r1.ebuild b/games-arcade/pachi/pachi-1.0-r1.ebuild
deleted file mode 100644
index d8cfae4ed69f..000000000000
--- a/games-arcade/pachi/pachi-1.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-# Upstream doesn't version their releases.
-# (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"
-
-DEPEND="
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-mixer[mod]
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-autotools.patch
-)
-
-src_prepare() {
-	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
-
-	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/pachi/pachi-1.0-r2.ebuild b/games-arcade/pachi/pachi-1.0-r2.ebuild
new file mode 100644
index 000000000000..00da8955ee37
--- /dev/null
+++ b/games-arcade/pachi/pachi-1.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+# Upstream doesn't version their releases.
+# (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"
+
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-mixer[mod]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-autotools.patch
+)
+
+src_prepare() {
+	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
+
+	fowners root:gamestat /var/lib/${PN}/data/scores.dat /usr/bin/${PN}
+	fperms 660 /var/lib/${PN}/data/scores.dat
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest
index ab98a23d91e0..af20c8e81b53 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 1614 BLAKE2B 1c1c339842ce7da65c7d03c2b6802cb6a6de443bee5cedcd2f874c38866cf299f1da0e42445cc82ef4a2975a9a36d4eb6d709f25b2f5a5530e19d687373d6038 SHA512 d7b67fa256d6866219d8ea95272b253c2dcbff1cf33c6798a9762c259bc2124986f6c4d75eaf73466b656825a45002c88bc19a06b1eb1ae0f909867caffaf3b3
+EBUILD shovel-knight-3.3.ebuild 1524 BLAKE2B 59dc13484695351d998739df4943d3b73d60e5833277aba3c3063a91c564012929034d6cf8bcd65f0ed6bf34148317f9c09d77aaa934d0a4d6ab245346e41b04 SHA512 6b20b241cf0735567844bd1965333aa907589b1b9ecc33416ee97f332a4c3491098976086e1185fa1371ef71baf79138f6a20022c0339db9c790567d261b3197
 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 711593617539..c7f98580ae68 100644
--- a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
+++ b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 
-inherit desktop unpacker wrapper xdg-utils
+inherit desktop unpacker wrapper xdg
 
 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"
+S="${WORKDIR}/data/noarch/game"
 
 LICENSE="Yacht-Club-Games-EULA"
 SLOT="0"
@@ -24,8 +25,6 @@ RDEPEND="
 	virtual/opengl
 "
 
-S="${WORKDIR}/data/noarch/game"
-
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR#/}/*"
 
@@ -62,6 +61,3 @@ src_install() {
 	newicon -s 256 ../support/icon.png ${PN}.png
 	make_desktop_entry ${MY_PN} "Shovel Knight"
 }
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index 5c7d819331c8..96904a3d5a35 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -3,5 +3,5 @@ AUX tomatoes-1.55-gcc43.patch 282 BLAKE2B 96ff4d81ca15fe6813dc3df77fdb126b4907d9
 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-r3.ebuild 1627 BLAKE2B 2be42abe1e64c49c0c27415fac17291de29c213328b0a71224c3fbf81a5077729c86e017a249aef16f0651a205d1759f2dbc0f318ef9a49bb386a7283ead31a5 SHA512 d0399e6fd944d6908f8137625c51d8192c66a95900b490368ce491f965c8f0472894a655e20a86a401c65260f7fec430c571bc337fb9bc2a1d6c4b65c34e3671
+EBUILD tomatoes-1.55-r4.ebuild 1642 BLAKE2B 1b4b45b6e21743243e1a35b5a3598ec75e0306ec12a0e8a8a80771a7a4a4d517c34ccc9f0d1462b48b310946e717f689afd8ce756eb22416c62e84a3cc99728c SHA512 9f0b29f0c4305c23829b737654880757bd7f2517ff8f8492f5d25a8975225a0c3a585794128d44dde39c1493dce994587efeb0be276a95ee1f9821e2faa54a13
 MISC metadata.xml 331 BLAKE2B 312d2ef06020a89fa08e79d82b22727eff32e689182f3f142bbc788555d2b05ddf93414a616deff188bc6d2ae35561da8fd832c2541c404d6136da144950c5b9 SHA512 adee588bcc930244c19ea9a3ac34b70c3afbbbed2b68d61289742fd7ca3d97eae5724cef90d350a4e5b8ff8b594f8d25fc1a5fbc672459034d0a492bb155223d
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
deleted file mode 100644
index 088f0a4563b1..000000000000
--- a/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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/tomatoes/tomatoes-1.55-r4.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild
new file mode 100644
index 000000000000..7bf17cee3fca
--- /dev/null
+++ b/games-arcade/tomatoes/tomatoes-1.55-r4.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} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+
+	insinto /etc/${PN}
+	doins config.cfg
+}
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index 7010d3e68e53..a6f7f2d4826f 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1,5 +1,5 @@
 AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
 AUX xbill-2.1-gtk2.patch 582 BLAKE2B d577b0ba7e6247594c616d0d439136d9e0a6378518085e5d29303dbdce065d21ab623d12a18716ce03c35bd00e2a73aa865553c3f541cfe48eacebf60116d467 SHA512 f25980493ccc86f42c0ac4d996b6ec1580011b7764e7b1ad80dd04698a094c0c1842512e544d62ffd527b9a08109f7389c1741f4837e5320accc128786dbc546
 DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
-EBUILD xbill-2.1-r3.ebuild 939 BLAKE2B e4b6236c6232c20f640f9328b9dd68b66da60a3d37256e1de9d78998db9fd22ef5ef738ecd48952a46887dcbbcb5e66873dc05bd4ccd00ef4ace7373934ef035 SHA512 a6c977e4b9b309b01eb01744aa0d5053c3d5fd068dfb7bff7e8c14481e6fd55e093a82091305ab189ad5d5651eeeab919098ddee14961ed87fb003908d9bcd39
+EBUILD xbill-2.1-r4.ebuild 955 BLAKE2B fb6a9a5586a91ed6654c81aab7d238757c31f592bda2941648be296d491c6214548371ec856714b5168a475957ddd3f373755f98cc776972b70796ca514699bb SHA512 16130a35969ab2182728cc934399d2f02c8966db63df33e78ac1d1842d8adfa011118d361288ff458c898920f67dec9bf36780eff20c7a1957ce4c049aecea3f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbill/xbill-2.1-r3.ebuild b/games-arcade/xbill/xbill-2.1-r3.ebuild
deleted file mode 100644
index 70378b00ceb9..000000000000
--- a/games-arcade/xbill/xbill-2.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A game about an evil hacker called Bill!"
-HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="acct-group/gamestat
-	media-fonts/font-misc-misc
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gtk2.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-motif \
-		$(use_enable gtk) \
-		$(use_enable !gtk athena)
-}
-
-src_install() {
-	default
-	newicon pixmaps/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} XBill ${PN}
-	fowners :gamestat /var/lib/xbill/scores
-	fperms 664 /var/lib/xbill/scores
-}
diff --git a/games-arcade/xbill/xbill-2.1-r4.ebuild b/games-arcade/xbill/xbill-2.1-r4.ebuild
new file mode 100644
index 000000000000..cbd5ae78dd07
--- /dev/null
+++ b/games-arcade/xbill/xbill-2.1-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="A game about an evil hacker called Bill!"
+HOMEPAGE="http://www.xbill.org/"
+SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="acct-group/gamestat
+	media-fonts/font-misc-misc
+	gtk? ( x11-libs/gtk+:2 )
+	!gtk? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk2.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-motif \
+		$(use_enable gtk) \
+		$(use_enable !gtk athena)
+}
+
+src_install() {
+	default
+	newicon pixmaps/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} XBill ${PN}
+
+	fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
+	fperms 664 /var/lib/xbill/scores
+}
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
index 613edeb15865..c41575796c41 100644
--- a/games-arcade/xgalaga/Manifest
+++ b/games-arcade/xgalaga/Manifest
@@ -1,4 +1,4 @@
 AUX xgalaga-2.1.1.0-respect-AR.patch 633 BLAKE2B 9bfcf18f6bfc8deaa39427269539c0f07ffff02dcec7cbdebdfd432bb07138ca85464d4bc4db96bf49ce8cbecaeb544074a22ba3a424526c4b2b6af4bd5f9668 SHA512 e094a8158bae4ac25573ce99f12e070eb444bb14e15f80c7d5380b0b9697ccc696797fb575e82ac9f5b214ef1a6561f71f8a84d42576bacae6d9c14718cb0367
 DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
-EBUILD xgalaga-2.1.1.0-r1.ebuild 1427 BLAKE2B c37ccc685beea069675296c7d3ae9122e201bf1769f4e7ffbe20c5c922e6d0bb36a3ef65d03eb839cf23d9c3c6d359aea3d8c40171d302933944ca9503dd6126 SHA512 e2d02a5e628a29e13c6ce091884dbb9063323bad0dab3c46701a25884611691dd1178eaca7c92d538cbd53f3a2fc50cd63e61763ce3001e0afeba62b98812325
+EBUILD xgalaga-2.1.1.0-r1.ebuild 1481 BLAKE2B 9273b52aeb3c9b746a1cbb9e550cd6051d692789354c13d4cb4d8ab9a9bf3fde78ffe90209e3139373832db0764f2740a948e5b4952bf56d27d1faf45d250c02 SHA512 12ab6b11e2f92f18d0840437ca3d3d91370e1daecac6ae1db6dd8c30371f180a0acba0669caa4e2c6b3efbfc2c26fd0de3fcab5bbb8574d95b0e4e2738cd3d45
 MISC metadata.xml 330 BLAKE2B b3e61a8f4911203a72c70798959045a62572b4a814bbf8f03ccf17f8da74eaa4c542883da6f2ff780c7e83ab26398ff95a46b36a41c22785903b0299707e6e9c SHA512 2c0045dadc3b72dda9b7f3389aebb5a2d38b91f2cd63891a9bd97e2f23971c916ce515cbbda6b0c6f2b8a600fc56bd77d9db749d223eee5cd6edc99525217545
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index 45c550a058be..1b87b13d58d9 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
@@ -60,6 +60,6 @@ src_install() {
 	touch "${ED}"/var/games/${PN}/scores || die
 
 	fperms -R 660 /var/games/${PN}
-	fowners -R root:gamestat /var/games/${PN}
+	fowners -R root:gamestat /var/games/${PN} /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
 	fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace}
 }
diff --git a/games-arcade/xjump/Manifest b/games-arcade/xjump/Manifest
index 9c08b5b08fdd..3929e883d189 100644
--- a/games-arcade/xjump/Manifest
+++ b/games-arcade/xjump/Manifest
@@ -1,5 +1,5 @@
 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-r1.ebuild 1445 BLAKE2B 581d4cb8d6b0f516c4dd94dfbc7bbf6303e6fe8120915075af34699fe4eddc60c03fb092fc5d0d37ca5936b740aa837ef3ff4c4490cd093ec4a8116ab96eb35d SHA512 661f55276b3bd10fa119205009dff1b44eb0618dc900904e48a9c9dfbd6ca208611dc4ab18b5faf352cdf2c15b965c07bceeeeceb803c8ee149f62a2e1448542
+EBUILD xjump-2.7.5-r2.ebuild 1460 BLAKE2B 072a22d6e147107cedc969c1ec8954a751040a89864f678c9315f10a84515f4ba6204967b18fecd5bbface570fec21b47ba76dd2cb6a7a9d1240662c532ce0fa SHA512 d3934f5a3d9cb6f25a9d6113da4980076331173d86d89a539d2b45fbfe66a186eaf8af2de59db507d89188a3615f2af058a96539e517338bb944148aa5970f12
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xjump/xjump-2.7.5-r1.ebuild b/games-arcade/xjump/xjump-2.7.5-r1.ebuild
deleted file mode 100644
index 5e3328386b46..000000000000
--- a/games-arcade/xjump/xjump-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-r2.ebuild b/games-arcade/xjump/xjump-2.7.5-r2.ebuild
new file mode 100644
index 000000000000..7dacc1d1aa39
--- /dev/null
+++ b/games-arcade/xjump/xjump-2.7.5-r2.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} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+}
-- 
cgit v1.2.3