gentoo resync : 15.06.2021

20 files changed, 164 insertions, 212 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index fdde033a5f29..27ea0218328a 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest
index 8b4209617c6d..a926806d46a5 100644
--- a/games-arcade/briquolo/Manifest
+++ b/games-arcade/briquolo/Manifest
@@ -1,6 +1,8 @@
+AUX briquolo-0.5.7-clang-widening.patch 881 BLAKE2B b551a268308c876f78b34584ebfd5bda97f420b972a8104a8cd733d785fd16280504767faecac7c9e5065643fe9deb93df77f91402cd60a20c301de7caeb6cf4 SHA512 ed43d416072a3025d81ad9775de1cfdda15fd436714302a7b2b30581794c55ef51cc9b0789b458228c9255714ff5fc53a9bbf528ac746a52510b681838e2ce18
+AUX briquolo-0.5.7-gcc11-fix-const.patch 394 BLAKE2B eec540576c3a465473fa13cef0177305a2622cf071dfb4a2092adfb75069c95b788f1f44381f551a23a34e96c00493b7ab3f20270051cd557dc2f0b76fc37159 SHA512 8614ca07f6c768f500e0c1ac039fcd6982e13913a0c0ffbb97913e44a8265f75bf25e43ad658821ad48a801f2c72921b99c93f7f7489e167056c20f65cab6b8c
 AUX briquolo-0.5.7-gcc43.patch 1967 BLAKE2B 0d7347e002022d12b95f3791beabc5b62e8f89bfccb0581b5907fcba024c6666962b50b50ef8a2bc3f4fcd8adb9b148ba7c70a0ee509f245444e9d4949f86bb8 SHA512 deb255f7201e3714b9a230a6b228d2789b9eba3a85fb930b92277a57c07bc8ac6a38f7028e3cfab8a298ad4833fe61c1dbcade3f0ac06381668dca337e1b8ca5
 AUX briquolo-0.5.7-libpng14.patch 1062 BLAKE2B 18049d54ed528cdbdfc712b85706b224609f05b129fa737aa4340fa25ee6b03f6b8e4eb764593781a93ab08dbf8229aee495fe809170fea0de1721477b1d6379 SHA512 0086a0cc8862c5c1c2000f8776bfcec1812a626eecdb15df4785bbd476e88fd55100d3f47877948c2af7500aba8f60f6c61fb19667e3823670a64f17eaa9c1b8
 AUX briquolo-0.5.7-respect-AR.patch 193 BLAKE2B c8594ba787c551a5f7a03ead31a79f55827dd879f245761f0556e5da61b88e5d6bd58861d7ff62d084bdc17da3be1ebe8c99eb1750cd19175ade6101d1d993a2 SHA512 027b30d972abf32644a45ea04cee69d73fa55a4292ba47a3de6b87a817e3e9bea00b28072864365f451948ea9aa1993de400523956be43a730bf74391e96ded0
 DIST briquolo-0.5.7.tar.bz2 2588084 BLAKE2B 4ec87a161df72f9cc0df592a5b18cdf7a42e9f66675b6eeec20f57f6be599942940eb341dc4927405a1402f1356f52bdd1bea2a6b72c5f36abf229c1ef42e5be SHA512 4ef78193c80ac3554b72149b8da9b5cfd5b8fd68932e5b52666d74642e94a7a3a596dbb6d2865cba526929dd6d9be89743847d5e77b6fbc687c32394bc3be3d2
-EBUILD briquolo-0.5.7.ebuild 1206 BLAKE2B 9c8e4268007e49e425a2c37ddc7335c585c064e01534a47e18d1a86fbbef180bab4bfaa766fb355c45c9f9e0f14b4a40d089808d6cf38d07976ab33f92548690 SHA512 e1d911fe8c3541334d81a77c47b15be3c6e63d97d2b09b95a9e179c7bfdece32edf3c04016e2011d9f75e355f0bde4f9893895036b8ad6f2bc3151edf12e72c8
+EBUILD briquolo-0.5.7.ebuild 1289 BLAKE2B 0d08f863d7f85900675919340b46356d487a8f1d53a248e2bc974d044ea9a62789b7aaa0c791cbc6f1deb4e7f7911a0c6885d82472917000e755f9fa9f3a2a2d SHA512 2f4c195555d28ba007ac2703d94196adc458f38e0bcb7cdefccc81e870ae1cfa84617c856192dea6a2719f8f02a52157f1bda79b92560baa260ef4435442d380
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad1..fff6d3ea6456 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${FILESDIR}"/${P}-libpng14.patch
 	"${FILESDIR}"/${P}-respect-AR.patch
+	"${FILESDIR}"/${P}-gcc11-fix-const.patch
+	"${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
 		-e '/^SUBDIRS/s/desktop//' \
 		Makefile.{in,am} || die
 	sed -i \
-		-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+		-e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
 		-e 's:=.*share/locale:=/usr/share/locale:' \
 		configure{,.ac} || die
 	sed -i \
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000000000000..5afaaefd5848
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
++++ b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+     {
+         GLuint TextureName;
+         Uint16 carac;
+-        unsigned int x1;
+-        unsigned int y1;
+-        unsigned int x2;
+-        unsigned int y2;
++        Sint16 x1;
++        Sint16 y1;
++        int x2;
++        int y2;
+     };
+ 
+     struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+     MOGL_Struct_Carac * _Caracteres;
+     MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-    unsigned int _LastTextureX, _LastTextureY;
++    Sint16 _LastTextureX, _LastTextureY;
+     unsigned int maxHeightCarac;
+     MOGL_Map_Carac _MapCarac;
+     MOGL_Vector_TextureName _VectorTextureName;
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000000000000..d5d68819675a
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
++++ b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+     struct CompareResolution
+     {
+-        bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++        bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y) const
+         {
+           return x.w < y.w;
+         }
diff --git a/games-arcade/excido/Manifest b/games-arcade/excido/Manifest
index 72a7e6885287..5edad57565e8 100644
--- a/games-arcade/excido/Manifest
+++ b/games-arcade/excido/Manifest
@@ -1,5 +1,5 @@
 AUX excido-0.1.5c-build.patch 1033 BLAKE2B 171f87f9c08d51969af8e9171bbae2b177192afb9dad0dcf975fdc4a50ccfc961d5caa055830b929beadc3120f0a627c638371125ca93b4b8b642d4b3b1321d2 SHA512 9cd1b44ae83e9cf1171869124866df78f6d9bc2d18d80968937b7edf7d60dedef3cd0451fd3f81406e5b3b36960b3ac8f77032625e1c545f04d70998da8701ab
 AUX excido-0.1.5c-freealut.patch 1204 BLAKE2B 1aa65ee8e91f01be2ed6af6e45d945d81b1d6b5714072701a8b189b30668a7ef430bb08d54c322c487f0748c0112499c32b52273bc94e2746b687acdd9ea6134 SHA512 11c41ba18f2b698fa4eedfb93d670a09ddd6d954d9504903f51f6df23096e3f72f2836193ca35a5aeb6e3524ad887e1cbf0eb879583988dd99b0b4c439997a1c
 DIST excido-0.1.5c-src.tar.bz2 2981629 BLAKE2B 504c21861a4d966400a94ef6733794f72edbf950a84dcd935213244252b771e168f0bb5e21780c90d2cd1a1799cac821a502dbb558ffe6204d4b552e5af465d4 SHA512 9e1b98ed31eac735087f451c466d0e0d1b885ad5336f7994abf8f844b1c27cc24e90048306ffd62864fa5ab2bada6744b4b54991c6eb9b22624af20c645e02d7
-EBUILD excido-0.1.5c-r3.ebuild 789 BLAKE2B d4e7146161ecd604ff845b2de8b97e34633860cc38e32bf2e07b936db3dcaf79ab52b9e2ecee8a023fdbf07c0c11a8ac7008a979bbc8b82ad9ce063cd16966b1 SHA512 ace3ee24dbc3155db5f276922b1b5d570f0b15288711312711e9a7fb9bae8031c6e665673d005714807ddfcbf7fb799f58b78a0ac0fe28dbe8be271e8d04ee5a
+EBUILD excido-0.1.5c-r4.ebuild 906 BLAKE2B 918a06cb089e1e0d50c68c40c5c0eb1d4b8daf1852cac4b4fce4c53059f747d16ee901bb6614e814121ac1e5c3230e55320015546401b45d0597fe878acbdf21 SHA512 729f8b95782e67a809913f8556a218c0718797c437c80d90aef0f7ec082152030bbae910aa85a3385fccbd44998ea4769ee7d5293141df08ba698ff5db892d4a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/excido/excido-0.1.5c-r3.ebuild b/games-arcade/excido/excido-0.1.5c-r3.ebuild
deleted file mode 100644
index cea4558b0b61..000000000000
--- a/games-arcade/excido/excido-0.1.5c-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A fast paced action game"
-HOMEPAGE="http://icculus.org/excido/"
-SRC_URI="http://icculus.org/excido/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-games/physfs
-	media-libs/libsdl[opengl]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]
-	media-libs/openal
-	media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-freealut.patch
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_compile() {
-	emake DATADIR=/usr/share/${PN}/
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins data/*
-	dodoc BUGS CHANGELOG HACKING README TODO \
-		keyguide.txt data/CREDITS data/*.txt
-}
diff --git a/games-arcade/excido/excido-0.1.5c-r4.ebuild b/games-arcade/excido/excido-0.1.5c-r4.ebuild
new file mode 100644
index 000000000000..6dd286165633
--- /dev/null
+++ b/games-arcade/excido/excido-0.1.5c-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Fast paced action game"
+HOMEPAGE="https://icculus.org/excido/"
+SRC_URI="https://icculus.org/excido/${P}-src.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-games/physfs
+	media-libs/freealut
+	media-libs/libsdl[opengl]
+	media-libs/openal
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-freealut.patch
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_compile() {
+	tc-export CXX
+
+	emake DATADIR=/usr/share/${PN}/
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	dodoc BUGS CHANGELOG HACKING README TODO \
+		data/{CREDITS,readme-jf-nebula_sky.txt} keyguide.txt
+
+	make_desktop_entry ${PN} Excido applications-games "Game;ArcadeGame"
+}
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 926de4af321a..1e3f8de527aa 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,4 +1,3 @@
-AUX 3.36.0-drop-unnecessary-files.patch 877 BLAKE2B f9ca65d20efbf9b40220274881328584803f0395f233062d395c21ca0192399855b78ac7e7da7ee72d08a16736bd62bbc5670f6abbaa1c98500fb4f82917c66d SHA512 9435b8aa2caf1f9cd058ed5fbda629237c67cd9ff161be57947612ed093498d3060b9130e608211b174323a83ba18d528c606a50e8cc156aa394f192a1192d93
 AUX gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch 3661 BLAKE2B c62908420b4b674a763dc2554c4ed73319bb7e58e4d4f50d1ac0e87c2fda0219415a8335c1f0c1b39c8b61de461168303f34e7ab1eb6c58f44c279411675e301 SHA512 366cfb89ce6923573c66d67cbedfae11f400790a366314a77f1197734ab2ee0760418b9e3d3eb4f7a6105bb63a918f3894b452f4aae68a0a87e03704de410aa7
 AUX gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch 7404 BLAKE2B b2bca8d4d93776a84b3853973cb88a1a9ab58d4ab3d78e5c0556b2557abeaeb5cc43643e25666484b9a66aa46d091abc45be18cfa5f4e2574251ae2b60451a39 SHA512 ebbae48d19a6cb7ac782db0cb57e29cde233c4f24d5d94c05203347065e0c22c6dcebb0f0202d2bc71ca0081675565f18b145dc58ebd630a30b85c4d9de4de98
 DIST gnome-nibbles-3.38.2.tar.xz 337680 BLAKE2B 96ca3794d72f600608b049aafe83808e917ec8e8462b19d31af36f2570e6c3fc8b3c9e85cbaa4ec9f041ecb934aa99701d13fcf232c447f5a4f51e6a98a66173 SHA512 e0146e33efa20ca48131be76a7f1738f8e3e2503a152c879e1d0d6accb091f9c4cb36c6d3009ca824bf6c4ac0ff5249b17e6423919c615992f0c4bef6dfcd601
diff --git a/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch b/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch
deleted file mode 100644
index 63ae21026066..000000000000
--- a/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2ca8c1e70635eba7f667e5d97b6d85bda2374b9e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 29 Mar 2020 19:13:14 +0300
-Subject: [PATCH] meson: Don't install data files consumed as gresources
-
-Fixes #36
----
- data/meson.build | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 08fa461..0492411 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -32,16 +32,6 @@ install_data([
-     'teleport.ogg'
- ], install_dir: sounddir)
- 
--# UI files
--install_data([
--    'nibbles.ui',
--    'nibbles.css',
--    'scoreboard.ui',
--    'player-score-box.ui',
--    'controls-grid.ui',
--    'preferences-dialog.ui'
--], install_dir: pkgdatadir)
--
- # Icons
- foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48' ]
-     install_data(join_paths('icons', 'hicolor', size, 'org.gnome.Nibbles.png'),
--- 
-2.20.1
-
diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest
index 64ee27853eb9..7b3ccf631abb 100644
--- a/games-arcade/rockdodger/Manifest
+++ b/games-arcade/rockdodger/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6.0a-sec.patch 588 BLAKE2B 1c6d4217d1a0cde1372549b1dc7e8dacc80c2caced3852a62b924086f4d7c5ce5dd698dc96058f1244a8ab2e82af9d4f31af4db1d609186af7581479bd57434b SHA512 8b9e3efce020a25f35efe277e45e9e7a234260c377fc7ef6feb90be25b3551c5cc74d726fefddac229c90fb6ee1730c98bc641a01c3d7a17ca69bf91d271edfb
-AUX rockdodger-0.6.0a-gcc41.patch 444 BLAKE2B 3418458d34d1b26c62d36327f9b53256e580a6ca7ee77d0cd6a16457aae244a9c5cdd262432506e4b1f843a12e28d72bec4a6e8946980eb6f93d5d6d9ff88900 SHA512 1fc4591c0bc3242a5760bf345c41c1f6f475f5e87e49df58697b91afcdd418864be896d9a674edeb9c38207f4a9b2ed3e2c73cb5d6dae225a7e016a3e4c7ab59
-AUX rockdodger-0.6.0a-underlink.patch 243 BLAKE2B 58e061e45bdb39a7bc23a81270ddafef284234b8ea32e4ad65f08fb6fcc51332dddf4f58480d9981467dd34668fa323fbf625917ea8d3531c857925ee9a54546 SHA512 681f925988471efd34a5a78f7eb8dc916e4fef30d11e2f89f9d14eda4639c3be407d843058aa503dcd6e5e8aad09fb288d6eafb16aac32df0601e2d6d9989ec5
-DIST rockdodger-0.6.0a.tar.gz 410223 BLAKE2B 5ccda4400468d6a7209adfdad3045773bf31581e34dfb77bff7d314ca9d9fa18e6c5a24996259782c002cf8ea611f92388c9ca46be4e0c7492a526421e8e8163 SHA512 d517cc844df21e8772b13d0226841a64bede0cc2f5461fb83d313f49cd99192dcf6af4597e3d1f3e1c60f578437e355ce665e0288415da803a503fb12d8462eb
-EBUILD rockdodger-0.6.0a-r2.ebuild 1527 BLAKE2B 0e3ad21b32f6dbd4348fd5194ee8f75210c89160121e3707371440e058bc4531d379c720f8e9ad7f8ef6ddd3fc38cb7550672eed80fb760d476ed37d2fe9f90a SHA512 94b714f014a078476e96acbe1c3c1dd3c6554e280d8cfd1b9a7974cab025cb85466e600346b9d19dcf77e0a44c0b614bba41b38f5f2009cb1872e824825c9e85
+DIST rockdodger-1.1.4.tar.gz 1026184 BLAKE2B 08885155508adb878908d3cf9201c98cffded37dea051cb9a668ddb63891a19369648964f3f19d94b72a08626d3d1dea73686b190898d8b59c3b91805e08677c SHA512 542a8b5b1a9dc7fc8e61d3183c14c3f45952614f2e00f71383dfd42ddcf275cbc14520797d4555f2f19f354a4f1819d8527a587598c9dbc06a75b21643a8b019
+EBUILD rockdodger-1.1.4.ebuild 1076 BLAKE2B 335e2e5ff5bdeca9221db80fc0325dd00263357f3e02c9b7717fa741a761b4e0d13f8e65e614a2d3ed45219d9424b19bbab0ce01786bec3fcc720bbd09032959 SHA512 f50aef0f20961129aee897d1c90c40da12f6ab013c20fbb0bd0597cef8bb9e3b240ff1546ea41673ea31442dcae0fc3e41801536ecaaa6e570e219d6b4420d14
 MISC metadata.xml 333 BLAKE2B 86aa43a28193b28b46fa52ba9a898a26a8f53b43e1c927062d29f34f8bdf952355ed6a333b0336278fce760dd5506588e103e96f7ef9449e0be26c72b6fe446a SHA512 fa4831b21647e72987ac3b956d81b5efc4308004c76213a046bd026a9939687b5f98c633a1f39d693a502f9557248e9810ba7301334cb3e82c9570e29efd6a6c
diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch
deleted file mode 100644
index b7af24f160a7..000000000000
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
-     else {
- 	char s[1024];
- 	umask(0177);
--	sprintf(s,"%s/.rockdodger_high",getenv("HOME"));
-+	snprintf(s,1024,"%s/.rockdodger_high",getenv("HOME"));
- 	if (f=fopen(s,mode)) {
- 	    umask(mask);
- 	    return f;
-@@ -478,7 +478,7 @@ void read_high_score_table() {/*{{{*/
- 	for (i=0; i<8; i++) {
- 	    char s[1024];
- 	    int highscore;
--	    if (fscanf (f, "%d %[^\n]", &highscore, s)!=2)
-+	    if (fscanf (f, "%d %1023[^\n]", &highscore, s)!=2)
- 		break;
- 	    if (high[i].allocated)
- 		free(high[i].name);
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
deleted file mode 100644
index f69797520975..000000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -206,7 +206,6 @@
- struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
- struct spacedot sdot[MAX_SPACE_DOTS];
- 
--struct greeble greeb[MAX_GREEBLES];
- struct greeble {
-     int active;
-     float x,y; // When landed, these represent an offset from the host rock
-@@ -214,6 +213,7 @@
-     int landed;
-     int boredom; // Goes up while landed
- };
-+struct greeble greeb[MAX_GREEBLES];
- // }}}
- 
- void init_greeblies() {
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
deleted file mode 100644
index 3ee7d9c5cc75..000000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@
- #SOUNDLIBRARIES=
- SOUNDLIBRARIES=-lSDL_mixer
- 
--LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES)
-+LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES) -lm
- 
- all:	$(EXENAME)
- 
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
deleted file mode 100644
index d446d78f27b8..000000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Dodge the rocks for as long as possible until you die"
-HOMEPAGE="http://spacerocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-sec.patch
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-underlink.patch
-)
-
-src_prepare() {
-	default
-
-	# Modify highscores & data directory and add our CFLAGS to the Makefile
-	sed -i \
-		-e "s:\./data:/var/games/${PN}:" \
-		-e "s:/usr/share/rockdodger/\.highscore:/var/games/${PN}/rockdodger.scores:" \
-		-e 's:umask(0111):umask(0117):' \
-		main.c || die " sed main.c failed"
-
-	sed -i \
-		-e "s:-g:${CFLAGS}:" \
-		-e 's:cc:${CC}:' \
-		-e '/-o/s:\$+:$(LDFLAGS) $+:' \
-		Makefile || die "sed Makefile failed"
-
-	# The 512 chunksize makes the music skip
-	sed -i -e "s:512:1024:" sound.c || die "sed sound.c failed"
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins data/*
-
-	newicon spacerocks.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Rock Dodger" ${PN}
-
-	dodir /var/games/${PN}
-	touch "${ED}"/var/games/${PN}/${PN}.scores || die
-
-	fperms 660 /var/games/${PN}/${PN}.scores
-	fowners -R root:gamestat /var/games/${PN}
-	fperms g+s /usr/bin/${PN}
-}
diff --git a/games-arcade/rockdodger/rockdodger-1.1.4.ebuild b/games-arcade/rockdodger/rockdodger-1.1.4.ebuild
new file mode 100644
index 000000000000..6f4a73b078fd
--- /dev/null
+++ b/games-arcade/rockdodger/rockdodger-1.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Dodge the rocks for as long as possible until you die"
+HOMEPAGE="https://bitbucket.org/rpkrawczyk/rockdodger"
+SRC_URI="https://bitbucket.org/rpkrawczyk/rockdodger/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod,wav]"
+DEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CC
+
+	local emakeargs=(
+		prefix="${EPREFIX}"/usr
+		gamesdir="${EPREFIX}"/var/games/${PN}
+		MOREOPTS="${CFLAGS} ${CPPFLAGS}"
+	)
+	emake "${emakeargs[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	newicon ${PN}.icon.64x64.xpm ${PN}.xpm
+	domenu ${PN}.desktop
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/${PN}.scores || die
+
+	fowners -R :gamestat /{usr/bin,var/games}/${PN}
+	fperms 660 /var/games/${PN}/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-arcade/sdlsasteroids/Manifest b/games-arcade/sdlsasteroids/Manifest
index 7c2d90150cec..e87222ca8b35 100644
--- a/games-arcade/sdlsasteroids/Manifest
+++ b/games-arcade/sdlsasteroids/Manifest
@@ -1,5 +1,5 @@
 AUX sdlsasteroids-3.0.1-gcc43.patch 422 BLAKE2B abe2fb65829d30b3f9d66eb585621e7ad4409831887cec96b6872e0bdd311ad9061b8be3208adf2f50adf2eafc87bc048834fbf91a65ab8401b939530e47b147 SHA512 3915518301cbf842de73f59caf70f8bf318d6824120386c1bc3844f454fe05676feab62e6f05adb17b13dd8f1c965da19d30c53391a0350c1f2849eac6a6aa59
 AUX sdlsasteroids-3.0.1-ldflags.patch 374 BLAKE2B 2b4ae7b2ca09f5573a1bbd317cb0cf9170eba0b56a9f04ed3bf825d4217d7b209c98983b1e757b71786ba0a25cc7a7a60485d7c418fc3bfce937f84d0a07ae22 SHA512 6e7ae0cb9b78f311d628859d0804ab635ff6c92106e9692591d83c13298fb491c0d75df188ab5a93d21170b3ebb9cae29a392b93343ade3eafc702dd4b320525
 DIST SDLSasteroids-3.0.1.tar.gz 531781 BLAKE2B 83d2f84623dd369bd0e36ddfec3a328f50b5ef1a9daf2bd4f6d2e5ff4bfd38f2832ff5378961c66fbf149fe82e45e48ad12aaf8a95abf4244a59fc7321403682 SHA512 5758e1a8540dd16b0993146e706d2f600713cf80500de32b5102e23933fad7e5f5d5b31bf7ebe0efcc89223f54ec67505728e5d3b8e2c8691b8efce671fcbdbc
-EBUILD sdlsasteroids-3.0.1-r1.ebuild 1249 BLAKE2B d92acc132627ba45e219b63ebfc4f1647339aae28f9e603f508000875f490ec2fc9136eeeb4bdfe9b1d08e0f3c445d864ccb0a0ae68bacf3faf036c1da08e4d3 SHA512 707b7f20ee5bb5133d3beb908ec9ab078ad471ac608143425fff007e475835bcd9bc1129ada87af11af7fb9d9ef127e1ffa40f7986f5c82bb5614f46e9e4367a
+EBUILD sdlsasteroids-3.0.1-r1.ebuild 1260 BLAKE2B 8050a72dea0cdd24e865ea0570855ed33efd3c3590ff901013147719f1ec7f8d8aa40a6fee693517d1522d0b461afffea6d49490c284a1c1b99d31286aeebdd6 SHA512 5cd885502efcebf9adc43e1d644dae04578ac5aff5ad4b00c4613de032c66b595ab7b602e52eab095c49eee3739ef13ad0fda0873ab64b5294066b8a9cbf1134
 MISC metadata.xml 329 BLAKE2B dba011e413928b68ccfbc07eb71a2cca9eb7071165c8d3f53ea47bcd54ffa03f16c670fbc41c1c0fc3b7de36da510109b3884f2b6a0e996bc8c3c5479ffac3f5 SHA512 4f3b7531ceb47a03591edb619cccddec6bb2f86bc9c66be1e88cb745d0b44220ab5e542f6d56bdb89494c341120c673f2e0cc34de6aeae2f1599cbb9b800f75d
diff --git a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild
index ca199ae1cbe8..aa5cf2f17d8a 100644
--- a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild
+++ b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop
 
 DESCRIPTION="Rework of Sasteroids using SDL"
 HOMEPAGE="http://sdlsas.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sdlsas/SDLSasteroids-${PV}.tar.gz"
+S="${WORKDIR}/SDLSasteroids-${PV}"
 
 LICENSE="sdlsasteroids GPL-2+ public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="virtual/opengl
+DEPEND="
 	media-libs/sdl-mixer
 	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-image[png]
-	media-libs/sdl-ttf"
+	media-libs/sdl-ttf
+	virtual/opengl
+	virtual/glu"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/SDLSasteroids-${PV}"
-
 src_prepare() {
 	default
+
 	eapply \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
+
 	sed -i \
 		-e 's/make /$(MAKE) /' \
 		-e 's/--strip//' \
@@ -47,11 +50,13 @@ src_compile() {
 
 src_install() {
 	dodir /usr/share/man/man6/
+
 	emake \
 		GAMEDIR="${D}/usr/share/${PN}" \
 		BINDIR="${D}/usr/bin" \
 		MANDIR="${D}/usr/share/man/" \
 		install
+
 	dodoc ChangeLog README README.xast TODO description
 	newicon graphics/sprite/bigast.png ${PN}.png
 	make_desktop_entry sasteroids "Sasteroids" ${PN}
diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 38331a01b778..9060fca754e4 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,4 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
 DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a
-EBUILD solarwolf-1.5-r2.ebuild 1083 BLAKE2B 495f500fdd6723e2b2622aa1ee35b8b818759c311806bd70efe10c138790b98e64d9765514528af9926cd7c08d86dafe319aee100f1289419162a283b40b1cd3 SHA512 06d6a231859c49849217b936aef9464cf837b293ebff4767e3080c3d9820082dc0fff7df1667c0325a04d61579ebb377f26e1a664caa8add32c4998c4b88f75e
+EBUILD solarwolf-1.5-r2.ebuild 1085 BLAKE2B 4c6452ed6a4105fab33fcf176dc4bc38f7c056b0d556cd3706e3c4767bd5dac5aeaffb31bba36db1ae6cd3fd193fff379e05393ea87fff7b6c864737443858c6 SHA512 7bcf0bdf0047f2b0f3a320fe0682fc4d045702827da46f2aa1867c0208afda5a618afe663bc8a4bcbe4b45de487bf8f63e4b57288f724659a5d36f68e58ff456
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
index 4d060a7fedb2..2ec0e6da2f73 100644
--- a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
+++ b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit desktop python-r1 wrapper
 
 DESCRIPTION="Action/arcade recreation of SolarFox"