gentoo resync : 12.03.2021

21 files changed, 183 insertions, 276 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index f8a6e44b5dbb..15c71a932b45 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/aop/Manifest b/games-arcade/aop/Manifest
index 92a8233e1643..3a273d19b550 100644
--- a/games-arcade/aop/Manifest
+++ b/games-arcade/aop/Manifest
@@ -1,4 +1,4 @@
 AUX aop-0.6-as-needed.patch 207 BLAKE2B f2baabf390d7376b55a815c256d0c63194a16d822abfbbc7103cd08463e6b193d443c0404cd691085f8a8a849cc14de98c642ff177ce7b6dae5d0e250bc264fc SHA512 4da201cc444e943f21287208944dae0fa981697af97618268ff94699f1ec52c8fcabcbe2b609f3ab36f4c19fdfdf4c76f7acbcfebe6978bb2740ba02a6c8ecc7
 DIST aop-0.6.tar.gz 11811 BLAKE2B 9b8a278ac4afb33dc9bb79d92343f9cf0fb4968aae04898700c948d01788cf33523989583ef39661142e0078e31488b24f8bf1a6bd9586e00afc4f7248fc8ca1 SHA512 0ce37647a0832b17e23df409633952f902e02666fa536cc4393a35bf91b245a501feeb4f14fd16d1a1d5c4f39682dad18a8e671e107e96cf5ba9c89965f8a77c
-EBUILD aop-0.6-r1.ebuild 663 BLAKE2B 764e4c1d22d70b7101edff9fa5ac5e582395b727cb43a02f44d290073ac7a584594c853211eed3a60de73422407791f365375d4da468f65a41754a69d74fcff5 SHA512 d51806af16deb45fbd9a56021229a8fed61569d97478bbf677a1575de9b63019f62d95cea5e6202a141c258d88e7d21da7aedd26e69b50abad1aa01465db32b0
+EBUILD aop-0.6-r2.ebuild 670 BLAKE2B 75ba25bbcbba898505ed9529d665129719c569f51677268d937f3862e3b039934d2c7582c8a6afe0c9dd4e1e67fc02a0358ff5f05e1ed69a1d18b4f8840245e7 SHA512 6b5044f4ea693481933b972b9a3700e9ee0f27aa3474b0ce7e0eeacb8961a4bbd2fda573f72307b411c5a72a248741560298f94a381f9caf212eff6c8c7f6b45
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aop/aop-0.6-r1.ebuild b/games-arcade/aop/aop-0.6-r2.ebuild
index c5edb52f234a..d0849e3b9401 100644
--- a/games-arcade/aop/aop-0.6-r1.ebuild
+++ b/games-arcade/aop/aop-0.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Ambassador of Pain is a curses based game with only 64 lines of code"
 HOMEPAGE="http://raffi.at/view/code/aop"
@@ -10,23 +10,28 @@ SRC_URI="http://www.raffi.at/code/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+)
 
 src_prepare() {
 	default
+
 	sed -i \
-		-e "s#/usr/local/share#${GAMES_DATADIR}#" \
+		-e "s#/usr/local/share#/usr/share/${PN}#" \
 		aop.c || die
-	eapply "${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_install() {
 	dobin aop
-	insinto "/usr/shate/${PN}"
+
+	insinto "/usr/share/${PN}"
 	doins aop-level-*.txt
+
 	einstalldocs
 }
diff --git a/games-arcade/crack-attack/Manifest b/games-arcade/crack-attack/Manifest
index d10de329e972..ecfcc787d041 100644
--- a/games-arcade/crack-attack/Manifest
+++ b/games-arcade/crack-attack/Manifest
@@ -1,5 +1,6 @@
+AUX crack-attack-1.1.14-avoid_bashisms.patch 535 BLAKE2B 2fd7517e9904d2c58dc288f39ac75c1c45ea051c3f8abc799531de9ee7ea263327b8d3293311a8ca835362df22a77cb3805f17f1462cbb8beb517451fce0d973 SHA512 d1571ba1fb658001b5b848070a390c74e6869573ce9ea93d26e15909de86606174883b105ccd1bcbbb0afb73908f5ed872fa4eca02a4bbea68df01261f03cc21
 AUX crack-attack-1.1.14-gcc43.patch 176 BLAKE2B 31ae3d2ada1212633ded026c9fbbdd517e7a7cc9742ad24036698c474a4b173cb7521857f6a41b7fe72cfff78f5db89236cc7ef3920658c7b3dc43a60cee793a SHA512 e9e5cc3c93bb00ad8e8b7d6bafd2035c13673fc27217fa6ba3d66ad285bd4d9f6048fbb933723d91e4c60495175fd065acc6663bcce0b2fb606f23f4ecbf4fb3
 AUX crack-attack-1.1.14-glut.patch 385 BLAKE2B 1f1b3830199c3488e71a6055b9db1092b1a730e194ed8f68974e6b8f867a8399b5d3f5b49011839a3e07a9265bca7e5e0f3d33ea634ffcb92fa68aa80dc4a3aa SHA512 d39bbd78172d9454a3f2244dff21e9f538c2235e86a3d8a53e855d0eb4f70403ff75b7fcaf774ad2054f77e9002786a802d1e3cfcc8d8dbb3ba082379e037949
 DIST crack-attack-1.1.14.tar.bz2 801404 BLAKE2B 78c6fa9ee16ddb341aa1f11d1964c7036c85d0b1f0145c6fe57d585eb4c237fdb33d351f0d5510eabaf7666a63e74f8afbe0f09952ec1d4c5713a87a89963b82 SHA512 1afc1a59e25359a82cabc33a1f999e1166dcf74c031c29a366f8414989bc7c32b9a40e467ee40a37901f2bd08f4569fed25c4d3021b1a75254614840410a7bfa
-EBUILD crack-attack-1.1.14-r2.ebuild 946 BLAKE2B 2c67cf472dcfc489c32412e9685423ed355256654ebb3e1ffd96814efcec916eafdb2dfeae8931dfb2b1900bb2ea31c5041ddfe208d1007f5f405a7c43081228 SHA512 a39048eef58fb35ec783eb6836a7198e6550f191986ba25544f34c9138ba9971121a7b3324f61f888ce6f8cb7a21b3b3af732993c56317bd4bdaf77177765847
+EBUILD crack-attack-1.1.14-r2.ebuild 1058 BLAKE2B 016bc128ee8877120c57539aaaf8bd58d1407acba429b72442a53a8b5963734933f48061eca2ea813339633abc57df1ca618c7eb2ec66ad1cfbf494789fefbfb SHA512 00f8fe172df167b01eee075fdda5cf6d87ffaa62248496d4529be50cb1d5cdae23d41630492859a8e4d0901f52e78736c6e73a4b2763250035d088c3c569bad6
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
index eded2a71ead8..24ca982cd260 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+inherit autotools desktop
 
 DESCRIPTION="Addictive OpenGL-based block game"
 HOMEPAGE="http://www.nongnu.org/crack-attack/"
@@ -15,28 +15,37 @@ IUSE="gtk sdl"
 
 RDEPEND="
 	media-libs/freeglut
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-mixer )
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-mixer
+	)
 	gtk? ( >=x11-libs/gtk+-2.6:2 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glut.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-avoid_bashisms.patch
+)
+
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-glut.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+	eautoreconf
 	sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
 	touch -r . * */*
 }
 
 src_configure() {
-	econf \
-		--disable-binreloc \
-		$(use_enable sdl sound) \
+	local myeconfargs=(
+		--disable-binreloc
+		$(use_enable sdl sound)
 		$(use_enable gtk)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
new file mode 100644
index 000000000000..8f405710dae4
--- /dev/null
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
@@ -0,0 +1,15 @@
+--- crack-attack-1.1.14/configure.ac
++++ crack-attack-1.1.14/configure.ac
+@@ -75,10 +75,10 @@
+     ],[found_sound=no]
+   )
+ 
+-  if test "$enable_sound" == "yes" -a "$found_sound" == "no"; then
++  if test "$enable_sound" = "yes" -a "$found_sound" = "no"; then
+     AC_MSG_ERROR(libSDL and SDL_mixer are required for sound)
+   fi
+-  if test "$found_sound" == "yes"; then
++  if test "$found_sound" = "yes"; then
+     AUDIO_CFLAGS="$SDL_CFLAGS"
+     AUDIO_LIBS="$SDL_LIBS -lSDL_mixer"
+     AC_DEFINE(AUDIO_ENABLED, 1, [Has audio support])
diff --git a/games-arcade/jumpnbump/Manifest b/games-arcade/jumpnbump/Manifest
index 6e1a92f98365..2abb46522183 100644
--- a/games-arcade/jumpnbump/Manifest
+++ b/games-arcade/jumpnbump/Manifest
@@ -1,4 +1,6 @@
 DIST jumpnbump-1.50-autotool.patch.bz2 94692 BLAKE2B 40fa60260426cc1461e3e31d220a8f7261c7ad9e079fb17011fff72dc7ad2d52f66fb040263502d6082f3609bda0c783dd5c8b6a1d226d4fa22a1f77e6bfe5c4 SHA512 3749f3bda969d9ab2225019d8a6333d23402c8e284c3278aad23f76d5436326fed1efcae28a8922f814e0cf8417ea20fc51abb34f70bd6d37afca803475214fa
 DIST jumpnbump-1.50.tar.gz 397208 BLAKE2B f62a30723d8a08976ba06b1941d62544a764b4d5cbce6b076d0f096af099d9db35a451c413f3c490e2aff0388c92456e46a70cdc6a9404449a19dc4a77be0db3 SHA512 a343e514efa42aacd2c0fd113269ebf27418ea851dad21cecfa16a765639cc6a5de43fbdb9ad2f0282740f369b7e457a236fc3e918b486af10222c733f5c8fb0
+DIST jumpnbump-1.61.tar.xz 309072 BLAKE2B 057f597aedfcacb5c45e2980d670109c6ed1d9508a17ff467f44e10190d84d19609fded416c30512a59385a6c59221da98af90069adc993f0cc4c9332d248321 SHA512 1c5999c6d0d00770416a61803e5dac4742e23d787ba6bec3742517e3eab006efe9448e59f3e84278e224e184a8ac8444c7c766b74374761b1aec7cffdc1708c1
 EBUILD jumpnbump-1.50-r2.ebuild 1282 BLAKE2B db863041ba35be6c23b2cbf7b25b25a3f022b61330c9d928e744cdbd9f4acd16ef2bcd4b03d2b67cb1707684b43ca6a02ff843e52ff23f28868b37e41b917f33 SHA512 dfc145c876b15655efc71f522c59443e0f99411dd121be441213a2f39cf07fb26ca71ce6f4d5f0c083cc2aaa137e24c4b9a1f26df6a438bfcdd5ec0834c95be1
-MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
+EBUILD jumpnbump-1.61.ebuild 1124 BLAKE2B c3691bf61af7c6e851b5c483bcb2384e89895e3fbd2c50d0b02478fe4c4ec528e520baf22f3280d552508e778ab316fde6f621fcc1e516fdbf00f5d6ef6a36db SHA512 c84789413db6261eed2764baaa582cde21209d2bdc80de45ba593bbfe982905e4618018c467de5785a22c7f48a3eae8f6f337b11edfebbd8cf1bce37710df4c5
+MISC metadata.xml 379 BLAKE2B f436676eb0dcf671aaa81bfe8604ac79a129908abea3dfc69085847867958f4871b2db0ef1ab42cc01d5381a82ec010e8bdab28bd11a87eac10ec5641182dbab SHA512 3a387ef707eca3ed9b936353fde531be510c32f18bf31023a01158464b293111dd114d2a26287d705af229a686bac1db36754b58702879f0ed5bc1b99f47eab9
diff --git a/games-arcade/jumpnbump/jumpnbump-1.61.ebuild b/games-arcade/jumpnbump/jumpnbump-1.61.ebuild
new file mode 100644
index 000000000000..d7aafa39634f
--- /dev/null
+++ b/games-arcade/jumpnbump/jumpnbump-1.61.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit python-single-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A funny multiplayer game about cute little fluffy bunnies"
+HOMEPAGE="https://libregames.gitlab.io/jumpnbump"
+SRC_URI="https://gitlab.com/LibreGames/${PN}/uploads/95acdae2a232513f068e260977371dcf/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	media-libs/sdl2-mixer[mod]
+	media-libs/libsdl2
+	media-libs/sdl2-net
+"
+RDEPEND="
+	${DEPEND}
+	gtk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_USEDEP}]
+		')
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+src_compile() {
+	tc-export AR CC RANLIB
+
+	append-flags -fcommon
+
+	emake PREFIX="${EPREFIX}/usr"
+	use gtk && emake PREFIX="${EPREFIX}/usr" jnbmenu
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	if use gtk; then
+		emake -C menu PREFIX="${ED}/usr" install
+		python_doscript "${ED}/usr/bin/jumpnbump-menu"
+	fi
+}
diff --git a/games-arcade/jumpnbump/metadata.xml b/games-arcade/jumpnbump/metadata.xml
index 1329ada5712f..81218895621f 100644
--- a/games-arcade/jumpnbump/metadata.xml
+++ b/games-arcade/jumpnbump/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Games Project</name>
 </maintainer>
 <use>
+	<flag name="gtk">Install Python-based GTK menu</flag>
 	<flag name="music">Enable playing of background music</flag>
 </use>
 </pkgmetadata>
diff --git a/games-arcade/supertransball2/Manifest b/games-arcade/supertransball2/Manifest
index 70cfd777199a..daef49254f23 100644
--- a/games-arcade/supertransball2/Manifest
+++ b/games-arcade/supertransball2/Manifest
@@ -1,4 +1,4 @@
 DIST stransball2-v15-linux.zip 302212 BLAKE2B 8b45e32f37c805e75ba0d19ef004d75baea689fe87e946d50301cef01230492fd531b4100bc6200a261c24463443b2811faea8d200d15b15af0c884dbc285d2a SHA512 e87655dfca039c0c8553372b4da139f1d8fa420aad1909b422318dc049a9f7972c8d2398b83fde677b3eaf21d2d70fad73d7ec0c4b7bcbeacbf3544e6e575f6a
 DIST supertransball2_1.5-8.debian.tar.xz 26148 BLAKE2B 50ada1b6976da9686aa5cabd5e3a04222e30f9c69565018eebe51271842842dab88829c0672d7375995e3835c3be4983c8990e736278177d7d10596ed2453a0c SHA512 efbb8517b73d4413755663f96aa01eb679b43876091920a6d9a9fc0a31d001828aa536ac59e74172fa519d14b1dff117c150c022fb8f3898efbee2901a418a53
-EBUILD supertransball2-1.5-r1.ebuild 1333 BLAKE2B 56bea69d0e38e0e889ac18a693a9f29661f87656a38a74d7b7e77908b72ba09a1ffdc432b95e98983558bcbf725062b58c9f1e7e4725edaaabc3b1ce0b59d95e SHA512 1b01dc0b82d0aa93dfe3bfcdeac492c4c9528008bef7bce564ff457d7cc04892025e935dc0c2fd99670036912526599e19e3085329888007b42eb88764669a6c
+EBUILD supertransball2-1.5-r1.ebuild 1316 BLAKE2B ca918d25bb84e773cfb02796885abbea53dbdab9fc90547587b333ec94b69f7903f8efebc2a50e26674b2cbb51b58aee68d4274d45295cc96b4258bfd552a3c0 SHA512 cd2f59e4ee3c89d8bcd6fa2f1d4720de81623b4970ca4bb1fc70ab399d5ee8be8aadf3960f6c7837a0a24e76b8204a51afc395113aa12a980bf8cf7cc3b10c74
 MISC metadata.xml 732 BLAKE2B 02a55b153806bf73c5f777a196d4bcaa79f3bf4155eda30b792b56ba1289df14c5d8597e38b1a2b122d7b53c4792e589a01b57bf31fafbae99333b3dead5e9f8 SHA512 ff6eef56c6c80e08bac6a0d2ce6f848d22e90c1326a2a3e0927c04fdabe38cd0736b8f3555cd8f0743d1ba6cc5094946488cb0b9cf1c1db4ee4176f3bde79e8d
diff --git a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
index 9b8e585d7b53..def712fd67b4 100644
--- a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
+++ b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit epatch desktop versionator
+EAPI=7
 
-MY_PV="$(delete_all_version_separators)"
+inherit desktop
+
+MY_PV="$(ver_rs 1- '')"
 MY_P="stransball2-v${MY_PV}"
 FILE="${MY_P}-linux"
 
@@ -12,12 +13,13 @@ DESCRIPTION="Thrust clone"
 HOMEPAGE="http://www.braingames.getput.com/stransball2/"
 SRC_URI="http://braingames.bugreport.nl/stransball2/${FILE}.zip
 	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-8.debian.tar.xz"
+S="${WORKDIR}/${P}/sources"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 RDEPEND="
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-image
@@ -25,24 +27,21 @@ RDEPEND="
 	media-libs/sdl-sound
 	media-libs/sge
 "
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${P}/sources"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	mv -f "${FILE}" ${P}
+	mv -f "${FILE}" ${P} || die
 }
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e "s:/usr/share/games:/usr/share:" \
 		"${WORKDIR}"/debian/patches/0001-Fix-unix-paths-and-Makefile.patch || die
 
-	epatch "${WORKDIR}"/debian/patches/*.patch
+	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
 
 	sed -i \
 		-e "s: -I/usr/local/include/SDL::" \
@@ -52,7 +51,7 @@ src_prepare() {
 }
 
 src_install() {
-	cd ..
+	cd .. || die
 	dobin ${PN}
 
 	doicon ../debian/${PN}.png
diff --git a/games-arcade/tecnoballz/Manifest b/games-arcade/tecnoballz/Manifest
index 985050997ed3..f1db03d06be6 100644
--- a/games-arcade/tecnoballz/Manifest
+++ b/games-arcade/tecnoballz/Manifest
@@ -1,6 +1,3 @@
-AUX tecnoballz-0.92-automake.patch 3753 BLAKE2B eebbb25a20b0916413f294764a6c5c88c686634bf722dbaf549ddb2829fb6fafab41bf41a3bcdec81c706acec3190c59acd67f3c4d9133674e083e439d1b127e SHA512 d18460a5129f97315384061858aa8f0b7d899daf3420ed442bc76840c013a732add50309d437c9dca37902b1d8820a7ff58839785017f4d314f614195c7e51d2
-AUX tecnoballz-0.92-gcc43.patch 456 BLAKE2B 01496e6a99ccf11507f0c0bdb6542551a99e7e25ef7f4cfd0005668ead93bab8f8e74ca4b7ef086f93c9f1d512422e76c62ee651a5e0a3af6c571caba2ba1ea1 SHA512 2fd980efff3bc9f1c68cd8c882cce877e1539c02fefeb241ff7c495fe2c4e872d143271cbaec45a576fd125c01fe45c4652201db9d20fb47eb51e7a372f1a2e7
-AUX tecnoballz-0.92-gcc6.patch 1583 BLAKE2B 27cab826c7f5fbd0cabd127618ab86136663865bb8d9090a78d5910c63763480d990fca36115b93a3c3743ef0fd2e61e1982fe97edd1c22dcb98ac7ae065505c SHA512 ffaa131b2d23c6cbb2cdba16443d898dd3719b54eac7f71b3c24678b4050520df19155ae92d1b095f9da4bf33cc80496ff57a4f4bcf78073dd220ce0face0c89
-DIST tecnoballz-0.92.tgz 2763879 BLAKE2B a9414c402781e9d65da5e3c0cfe4815fd80978ff874fa245237baca960278c85ba33ff2a59debf0cd6547d75e20f39afc058bd1204405ecef27d62bb8bdfdbb7 SHA512 e3868e846cdebaed6ee78050560be86557c6d01ee6512375a09eccbcf70f0cd12e419c6997a348794a41dfb75f0f3cb70321f1bb9a9bf1156a90976b0e401e13
-EBUILD tecnoballz-0.92.ebuild 1125 BLAKE2B 2f62a4d0caa111d12d0ac108545edca3662194ad3b691b45d8761ecc904b6cd84ba9ad08fcc58f806585bb56fb2b42c7fbfb7ac643098290f5110070181c5c15 SHA512 caa45f9bf8ae0ef977e99a0c4c1cac8603f52700e8b990dc8b643f2abd5f8556fe4c0c40c54f4365b3c958920671efff80becba88844a55b6e5439b4e0d329e3
-MISC metadata.xml 639 BLAKE2B ba0f916050e1914e47eec668152e2d935e537d68a54bb5d75613fe8b3a4162e8bcff96e6910230d55aa3899d2131757002d28f925aa38b9ed983467a8c070353 SHA512 edcb9678cca9ef9f537c4f2716799a5aa6a5890188173c06d9702fa99cb68411003d0aeb04e4df90faeb6efcdd024c4e494a51ed8645b7217fc073aa9916b8a5
+DIST tecnoballz-0.93.1.tar.gz 1989092 BLAKE2B b623a11b9cbb599af85cd8a8cae712dc6403cc0e406f0ecee00f92e571a94db9ea3b8446d3abf9e6992fcb680775ea5e83cb5c58b563c71ddf83c6a969ac4e69 SHA512 5ccbff786398b191f56809180e7309a1e183852f69f51c1797e9e5db5e7ef04d8daa37940c31c2d5ab6911974d140da5d88d81d668122a0ffc37938ef856702b
+EBUILD tecnoballz-0.93.1.ebuild 828 BLAKE2B f2df8ed7267b29ed631e9485db86f558481c934b526a20c053d18ab6f93909bf3238985ca45b5e72faf1dde7b605a2c2f2bbff746d1b13be69f07e694c9834e3 SHA512 57be9347b57c12020da516b43da06231c0ceec213292d7266f380c2be8b6251db32dfb5a69f4802c31fb207392e62130a7c3582ed896ace15c5864c897a94ba1
+MISC metadata.xml 723 BLAKE2B 91b24860dca2d3dd12622f6b257ff23936080dc568434f0281c94b791c503f56cf1bc7cb6f381437ca517679bf5b83e0430b312061832ce8a4af44236e811f2a SHA512 b601747202842bbf24627863a337684da2fd5f39c3ca7583880f00317bf7444a75743bb913cd8fa301362271754f3294e7b72c2e1fa7f9bc7d1fb09b95e79940
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch
deleted file mode 100644
index b2f0379e4899..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- Makefile.am.old	2008-10-07 10:42:11.000000000 +0200
-+++ Makefile.am	2008-10-07 10:49:35.000000000 +0200
-@@ -1,18 +1,6 @@
- 
--gamesdir = $(prefix)/games
--scoredir = /var/games/tecnoballz
--score = tecnoballz.hi
-+localstate_DATA = tecnoballz.hi
- 
--SUBDIRS = src 
-+SUBDIRS = src man
- 
--pkgdatadir = $(mandir)/man6
--dist_pkgdata_DATA = man/tecnoballz.6
--
--install-data-hook:
--	-chown root:games "$(DESTDIR)/$(gamesdir)/tecnoballz"
--	-chmod 2755 "$(DESTDIR)/$(gamesdir)/tecnoballz"
--	$(INSTALL) -d $(DESTDIR)/$(scoredir)
--	$(INSTALL) $(score) $(DESTDIR)/$(scoredir) 
--	-chown root:games "$(DESTDIR)/$(scoredir)/$(score)"
--	-chmod 664 "$(DESTDIR)/$(scoredir)/$(score)"
- 
---- src/Makefile.am.old	2008-10-07 11:16:44.000000000 +0200
-+++ src/Makefile.am	2008-10-07 11:18:32.000000000 +0200
-@@ -1,14 +1,12 @@
- 
- NULL =
--gamesdir = $(prefix)/games
--scoredir = /var/games/tecnoballz
- score = tecnoballz.hi
- 
- SUBDIRS = TecnoballZ 
- 
--games_PROGRAMS = tecnoballz
-+bin_PROGRAMS = tecnoballz
- tecnoballz_SOURCES = $(SOURCES_MAIN) 
--tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ 
-+tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(localstatedir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ 
- tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L.
- 
- SOURCES_MAIN = \
---- src/TecnoballZ/Makefile.am.old	2008-10-07 17:17:47.000000000 +0200
-+++ src/TecnoballZ/Makefile.am	2008-10-07 17:20:03.000000000 +0200
-@@ -1,6 +1,6 @@
- NULL =
- 
--SUBDIRS = lores hires textures sounds musics
-+SUBDIRS = lores hires textures sounds musics texts
- 
- pkgdatadir = $(datadir)/tecnoballz
- dist_pkgdata_DATA = \
-@@ -14,4 +14,5 @@
-   tilemap-guardians_40.data \
-   tilemap-menu_20.data \
- 	tilemap-menu_40.data \
-+	levels-data.xml \
- 	$(NULL)
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ src/TecnoballZ/texts/Makefile.am	2008-10-07 17:30:18.000000000 +0200
-@@ -0,0 +1,11 @@
-+textsdir = $(pkgdatadir)/texts
-+texts_DATA = main_menu_en.txt \
-+	main_menu_fr.txt \
-+	popup_menu_en.txt \
-+	popup_menu_fr.txt \
-+	scrolltext_en.txt \
-+	scrolltext_fr.txt \
-+	shop_en.txt \
-+	shop_fr.txt \
-+	short_info_messages_en.txt \
-+	short_info_messages_fr.txt
---- configure.ac.old	2008-10-08 23:10:26.000000000 +0200
-+++ configure.ac	2008-10-08 23:11:08.000000000 +0200
-@@ -50,21 +50,6 @@
- 
- LDFLAGS_="${LDFLAGS_save}"
- 
--AC_CHECK_LIB(vorbisfile, ov_raw_seek, [
--	MM_LIBS="${MM_LIBS} -lvorbisfile"
--],[
--	AC_MSG_ERROR(Could not find the vorbisfile lib : -lvorbisfile)
--])
--AC_CHECK_LIB(ogg, ogg_stream_packetin, [
--	MM_LIBS="${MM_LIBS} -logg"
--],[
--	AC_MSG_ERROR(Could not find the ogg lib : -logg)
--])
--AC_CHECK_LIB(smpeg, SMPEG_play, [
--	MM_LIBS="${MM_LIBS} -lsmpeg"
--],[
--	AC_MSG_ERROR(Could not find the smpeg lib : -lsmpeg)
--])
- AC_SUBST(MM_LIBS)
- 
- AC_CHECK_LIB(mikmod, Player_Stop, [
-@@ -81,5 +81,8 @@
- 
- 
- dnl  Output makefiles
--AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile)
-+AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile
-+	src/TecnoballZ/texts/Makefile
-+	man/Makefile
-+	man/fr/Makefile)
- 
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ man/Makefile.am	2008-10-08 10:36:15.000000000 +0200
-@@ -0,0 +1,2 @@
-+SUBDIRS = fr
-+man_MANS = tecnoballz.6
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ man/fr/Makefile.am	2008-10-08 10:36:15.000000000 +0200
-@@ -0,0 +1,2 @@
-+mandir = @mandir@/fr
-+man_MANS = tecnoballz.6
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch
deleted file mode 100644
index ae190abd64c6..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/surface_sdl.h.old	2008-10-07 10:16:25.000000000 +0200
-+++ include/surface_sdl.h	2008-10-07 10:16:38.000000000 +0200
-@@ -46,7 +46,7 @@
-   ~surface_sdl ();
-   SDL_Surface* get_surface ();
-   char* get_pixel_data ();
--  char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
-+  char* get_pixel_data (Uint32 coord_x, Uint32 coord_y);
-   Uint32 get_row_size ();
-   Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
-   void clear (Uint32 color = 0);
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch
deleted file mode 100644
index f06a2ac2a0db..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974
-Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2
-
---- a/include/tiles_background.h
-+++ b/include/tiles_background.h
-@@ -47,7 +47,7 @@
-     static tiles_background* tiles_background_singleton;
-     static Sint32 table_pos1[16];
-     static Sint32 table_pos2[16];
--    static char couleurs[448];
-+    static unsigned char couleurs[448];
-     static const Sint32 TILES_32_WIDTH = 32;
-     static const Sint32 TILES_32_HEIGHT = 32;
-     static const Sint32 TILES_64_WIDTH = 64;
-@@ -63,7 +63,7 @@
-      * or TILES_32x32_WITH_4_COLORS */
-     Uint32 type_of_tiles;
-     /** 4 color palette index */
--    Uint32 palette_index;
-+    Sint32 palette_index;
- 
-     bitmap_data *current_tiles;
-     Uint32 *map_tiles;
---- a/src/tiles_background.cc
-+++ b/src/tiles_background.cc
-@@ -663,8 +663,8 @@
- 
-     }
-   palette_index = pal_index;
--  char *color = &couleurs[0];
--  unsigned char *colPT = (unsigned char *) (color) + pal_index;
-+  unsigned char *color = &couleurs[0];
-+  unsigned char *colPT = (color) + pal_index;
-   SDL_Color *pal = display->get_palette ();
-   SDL_Color *lighted = pal + 1;
-   SDL_Color *dark = lighted + 128;
-@@ -702,7 +702,7 @@
-  * 4 * 4    : 16 composantes by palette
-  * 112 * 4  : 448 composantes
- */
--char
-+unsigned char
- tiles_background::couleurs[448] = {
-                                     0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80,
-                                     0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20,
diff --git a/games-arcade/tecnoballz/metadata.xml b/games-arcade/tecnoballz/metadata.xml
index 5dbd2510d79a..0fac86988986 100644
--- a/games-arcade/tecnoballz/metadata.xml
+++ b/games-arcade/tecnoballz/metadata.xml
@@ -12,4 +12,7 @@ attack weapons with an enormous power of fire that can be build by gaining
 bonuses. Numerous decors, musics and sounds complete this great game. This
 game was ported from the Commodore Amiga.
 </longdescription>
+<upstream>
+	<remote-id type="github">brunonymous/tecnoballz</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
deleted file mode 100644
index 272be1639d8f..000000000000
--- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools games
-
-DESCRIPTION="An exciting Brick Breaker"
-HOMEPAGE="http://linux.tlk.fr/games/TecnoballZ/"
-SRC_URI="http://linux.tlk.fr/games/TecnoballZ/download/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libmikmod:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc6.patch \
-		"${FILESDIR}"/${P}-automake.patch
-	mv man/${PN}.fr.6 man/fr/${PN}.6 || die
-	# don't combine explicit and implicit rules for make 3.82 (bug #334629)
-	sed -i -e '/supervisor.c /s/.c /.cc /' src/Makefile.am || die
-	sed -i -e '/^CXXFLAGS=/d' configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	fperms g+w "${GAMES_STATEDIR}"/${PN}.hi
-	make_desktop_entry ${PN} Tecnoballz
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	has_version "media-libs/sdl-mixer[mikmod]" \
-		|| ewarn "To have background music, emerge sdl-mixer with USE=mikmod"
-	games_pkg_postinst
-}
diff --git a/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild b/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild
new file mode 100644
index 000000000000..71150e1504fd
--- /dev/null
+++ b/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="An exciting Brick Breaker"
+HOMEPAGE="http://linux.tlk.fr/games/TecnoballZ/"
+SRC_URI="https://github.com/brunonymous/tecnoballz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/tinyxml
+	media-libs/libsdl[joystick]
+	media-libs/sdl-mixer[mikmod]
+	media-libs/sdl-image[png]
+	media-libs/libmikmod:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	mkdir man/fr || die
+	mv man/${PN}.fr.6 man/fr/${PN}.6 || die
+
+	sed -i -e 's:\$(prefix)/games:\$(prefix)/bin:' src/Makefile.am || die
+	sed -i -e '/CXXFLAGS=/d' -e '/^else/d' configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} Tecnoballz
+}
diff --git a/games-arcade/xscavenger/Manifest b/games-arcade/xscavenger/Manifest
index 07b8dfa819a5..3624f84a1a6b 100644
--- a/games-arcade/xscavenger/Manifest
+++ b/games-arcade/xscavenger/Manifest
@@ -1,4 +1,4 @@
-AUX 1.4.4-gentoo.patch 5762 BLAKE2B 626debb4f67b0c9b90a783887ae2601cf2750c7358ba03638176e0afe7f2b51fe1e450e6ad56dbdfadbfd4413a31e6014c22b46409afec5ea438546b12338b78 SHA512 95e5c803b4d60b110be44254d1ceb78ea4ba3c7c72d6d95d856616902160141975ee57ee40c4a8c785220d71821531a02d2b823cfa5dca2cbbdd6b8b9bb842a5
+AUX 1.4.4-gentoo.patch 5528 BLAKE2B 9812d8fa63b449dc207804452566a2afe1360843a9866203f7c065c60eeb5bc13c42c80af0224d073ecdf65085c813d040551d5acf43f26381481c8d0dbc682f SHA512 105c3cf3cf2e02ca3350901716b268e35dbb414c5d5eb233b6fef897fab3f969ab8eec67cfc9080df75d9372a4955be7212bfc2cfe8efd592709a460a164e5bd
 DIST xscavenger-1.4.4.tgz 193346 BLAKE2B eb86b97fad8a9d261935579d298f43e7063fbd0624e8fd654c72b4130e98db38541d54c59938375c8d6df4b50193436f86826c49b8bafe123b4be5c80d3f75d8 SHA512 5f200912b9114ea0c09f0bfcc3f06be2e7c2e1700a744319081f5f3a22c8b93663477076af27837326acf9830af6f597cf8f8fb44562db7d00128321487841ec
-EBUILD xscavenger-1.4.4-r1.ebuild 894 BLAKE2B 0eb536645b6e2fedd209d7236a87034c48e2f96857f20be25cfe708670f09f5d7baf7b5cb9239f5b9055443d08617e08c887f5ad60768617c897769a1e007fd6 SHA512 74ca79787d535b16b741ce5fa3c9a5856aabfc0e51b4ff9cdd3bf1be068a700ce263eee5fa497575986aeb19b9cf8ad1d22815742669db262c17c03857a89020
+EBUILD xscavenger-1.4.4-r2.ebuild 891 BLAKE2B e8e39d8ee2ddf8f9540d07c75b714daa379eb2f0a7a9cf20d83c69abe14ccc1fd18078d920623716f0fb898c6d56ab57f5b703c8a57e55b207ab0dffae0adcee SHA512 54f5926eabee5c6411cba205dc798c19eaf5f5729e6a02126cbba02b18ff2c142eb4606a92181c4c71391ce12a2f2cdb51da835e132eb310786ab21a3b865f1f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xscavenger/files/1.4.4-gentoo.patch b/games-arcade/xscavenger/files/1.4.4-gentoo.patch
index df5936ed3de8..4c51b37d2157 100644
--- a/games-arcade/xscavenger/files/1.4.4-gentoo.patch
+++ b/games-arcade/xscavenger/files/1.4.4-gentoo.patch
@@ -1,6 +1,5 @@
-diff -urN xscavenger-1.4.4.orig/src/Imakefile xscavenger-1.4.4/src/Imakefile
---- xscavenger-1.4.4.orig/src/Imakefile
-+++ xscavenger-1.4.4/src/Imakefile
+--- a/Imakefile
++++ b/Imakefile
 @@ -1,20 +1,36 @@
  # set this to the path where data files should be stored.  LIBDIR
  # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so
@@ -44,9 +43,8 @@ diff -urN xscavenger-1.4.4.orig/src/Imakefile xscavenger-1.4.4/src/Imakefile
 +NormalProgramTarget(scavenger,$(OBJS),,,$(XLIB))
 +InstallProgram(scavenger,GENTOO_BINDIR)
  InstallMultipleFlags($(LIB_DATA),$(LIBNAME),-m 644)
-diff -urN xscavenger-1.4.4.orig/src/scav.c xscavenger-1.4.4/src/scav.c
---- xscavenger-1.4.4.orig/src/scav.c
-+++ xscavenger-1.4.4/src/scav.c
+--- a/scav.c
++++ b/scav.c
 @@ -240,15 +240,19 @@
  
  
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
index 6a578398112d..78c6be00a5a6 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop epatch toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Lode-Runner-like arcade game"
 HOMEPAGE="http://www.xdr.com/dash/scavenger.html"
 SRC_URI="http://www.xdr.com/dash/${P}.tgz"
+S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="x11-misc/imake"
 RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}/src"
+PATCHES=(
+	"${FILESDIR}/${PV}-gentoo.patch"
+)
 
 src_prepare() {
 	default
-	epatch "${FILESDIR}/${PV}-gentoo.patch"
+
 	sed -i \
 		-e "s:GENTOO_DATADIR:/usr/share:" \
 		-e "s:GENTOO_BINDIR:/usr/bin:" \