gentoo resync : 25.11.2020

34 files changed, 666 insertions, 252 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 65409ac9048f..2903cf88d6c3 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
index 33534d0756da..513e4cb9619e 100644
--- a/games-arcade/cavezofphear/Manifest
+++ b/games-arcade/cavezofphear/Manifest
@@ -1,4 +1,5 @@
 AUX cavezofphear-0.5.1-gentoo.patch 876 BLAKE2B fe2ff1ff1b1698ecbe06492bd80b8104908def9b1d4810b2c6b569e55d71a420a70a2d731555cee3a42adb40fa76b2964e2ba57105a1b47c00f54ca48851b213 SHA512 ee3d37644d1b94b39db2274eac0eadd3a823736177da317a2476238dbebe1a8a5af466f01771249e59aed838c684c9fd59fe7868aac3f1e1b89a75863bc49af4
+AUX cavezofphear-0.5.1-no-common.patch 438 BLAKE2B 919c2d0f35ad757b49ae742a4bffe84e2eda7c1e055e08a30e14e47c461994191792a500825b15b13bd35322f9e737fc97886753c0b221bc2fde80fee45f4f81 SHA512 49c835a11f03ac1fe0e8ba17281dc0fd4f1092bc60cbb0354c3c8036320cb6831f5d4908fedbfc2a95186e514a2d08f6b7c1f2711dbf620a262da4369bb2f2a8
 DIST phear-0.5.1.tar.bz2 25750 BLAKE2B 0b2c4a6f51fadd48a1e01dd5ac2072984368b3314fd3df01d4ad8adfdc0d031d443ac5f950651d4fff4ff5019b61868532eff0ed3d31bd6b2ba0f97893391d6a SHA512 23326a63acc06e77a1dd3505345940f8ef31b671282e00f623b181fe1cdbdf1b7e4b37a6e91ea430348a02239ed1450736dc075ea3af3eee0e8acb115aa89f3b
-EBUILD cavezofphear-0.5.1.ebuild 763 BLAKE2B 31163b56bcfb24adaa5f7bc71f7273c9d133dc1d458f098641264870589668d4ef3a73f10625ce5ef205e3074d670ca6de22d9a6145d96a795b53456bdde77a5 SHA512 645eab9394c91616d30f4dc0b783dad373fb1ef62bedf1c792db0ee9f25e501a4fc9059a9b7c07b94fe346a95126b765541f4d8bf55e4ac88522358dd6562c00
+EBUILD cavezofphear-0.5.1.ebuild 806 BLAKE2B 7960ffdbfc3c760c8a35d1ec5dda7e74e61d72b09c29b22c4c5b06163eb24eae1cf2525646cd632d625abae44dc13644ec34faf2212e2173caf90b7efde03821 SHA512 6fad3d356a96a477bfe0a9f14acf82ce079195115487827d4b2f2b5e9104afd4f4f6af9e2c33f1b8866fe04d0977114a1cca41fade98284a98ab760c5b2cd2ee
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
index 459bd6d3f2ae..1069f5a9ce3c 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ S=${WORKDIR}/${P/cavezof/}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-no-common.patch
 	sed -i \
 		-e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
 		src/{chk.c,main.c,gplot.c} \
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
new file mode 100644
index 000000000000..4cc9bb5be02c
--- /dev/null
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/706880
+--- a/src/editor.c
++++ b/src/editor.c
+@@ -24,7 +24,7 @@
+ #include "common.h"
+ #include "proto.h"
+ 
+-char map[MAP_YSIZE][MAP_XSIZE];
++extern char map[MAP_YSIZE][MAP_XSIZE];
+ int lock;
+ int last_obj;
+ 
+--- a/src/frame.c
++++ b/src/frame.c
+@@ -26,7 +26,7 @@ void bail(char *message);
+ void sigint_handler();
+ void sigwinch_handler();
+ 
+-int need_refresh;
++extern int need_refresh;
+ 
+ void curses_start(void)
+ {
diff --git a/games-arcade/ceferino/Manifest b/games-arcade/ceferino/Manifest
index abf2ffa90a1f..d3da9c2e1220 100644
--- a/games-arcade/ceferino/Manifest
+++ b/games-arcade/ceferino/Manifest
@@ -1,3 +1,3 @@
 DIST ceferino_0.97.8+svn37.orig.tar.gz 2104956 BLAKE2B b3cb68d37e383223def569a333950511e4506b1bea1337189dda36e4c04fd6261c45d532bb2ad3691e73989e8ce5544f7d5e750d035081441f8241401d62217b SHA512 83bccb39f0ecd9f41767c4d94cebb3266c77f11eb22d6cf517f6488af384bad88bdd538b5746e0a3c6e1a57481a4c946ec03afb97a000cd21664d3f179e1a9b6
-EBUILD ceferino-0.97.8-r2.ebuild 1166 BLAKE2B 0d2ac976cf4d52f0970cb737f1678d3a295c64b850be7eee72b5af81c87f8bcd333c60957350e37110765f119af2c36b4027ffc6e2707b48a3027b1ac3eb2d14 SHA512 1e3e42e4f9309ef06040b5b636395155445a7ba48a895f3319ae4a06509d15d76262559da044e01c53b6097131be1e74d2b39db66527927bba2a5896000935ee
+EBUILD ceferino-0.97.8-r2.ebuild 1126 BLAKE2B 64b68b3f59af2ca6577fcd2df882ff92f2c977c8aa0061b308a6aed6e7d4b3177fd61a99d69f3e2f5a5c38c9ee88b3cda844e4aa595a07d90369f295bce10ec6 SHA512 b172b191c483ac885fa88c33cf1c0d3cfc8fd3c6cdeebbca075933a36250f60c6d1550893b4f43551f266704f199e06ca1a52e14ccaddbba84535a66d38bed2a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
index feb2563f0e38..390859615e7d 100644
--- a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
+++ b/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,6 @@ S="${WORKDIR}/${P}+svn37"
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-latin1.patch
 	sed -i \
 		-e '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \
 		src/Makefile.am || die
diff --git a/games-arcade/diameter/Manifest b/games-arcade/diameter/Manifest
deleted file mode 100644
index 763a4257b7e7..000000000000
--- a/games-arcade/diameter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST diameter-0.4.0.3.tar.bz2 4729201 BLAKE2B e96989e0213bbea1c0e7c8d5bea155c2a561741c367220f5d0fb7a4630c076932a4393ad577573195e96945fc812e9a1fb6026089d601d96a22be5004c77877e SHA512 74491d49b233f16b44e4ea7c477fe5c6d71bc88c34b815f7992ea881558e2b4de98b10c5041cff6d0a6098dc4f440291825fb1746ff0282e3f538fac4ee4975d
-EBUILD diameter-0.4.0.3-r2.ebuild 1305 BLAKE2B c173c1700a437d5b2af420444461b6335ba4407ae3142f9cc84a2ca65d5565b19edb0cca611a5f8071cf95662cff541efe972dfba52c52eea2bf3fea4b27593d SHA512 b133153fd6ce2012df7701c201dbeca46bdb4519a43356cf02dec1af206febbc246df031d3a831aab7caa6147943093445b7c6599294cdab8265c1c6d310d5d8
-MISC metadata.xml 637 BLAKE2B 013b8e33bef387c1dd5e8e8380e4cac93b3271c1e94178a2a0bc33b11371dce4c396f7402f4127a9266fae89ed1f7d3e18afb4fbf97cc5473f44e8c166ceef7f SHA512 307ba08fa4280af81002a0993f4539021afa6507c67dccf9c5a2eeedeb07e820f0c3ad5ce8a0bf19d71087e5fe41e6b86ff6ce097f355ff00f11e0374bd771dc
diff --git a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
deleted file mode 100644
index a7f2160770db..000000000000
--- a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Arcade game with elements of economy and adventure"
-HOMEPAGE="https://sourceforge.net/projects/gamediameter/"
-SRC_URI="mirror://sourceforge/gamediameter/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-games/guichan-0.8[opengl,sdl]
-	media-libs/libpng:0=
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[mod]
-	virtual/opengl
-	virtual/glu
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gamediameter
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:gamediameter:diameter:" \
-		configure.in || die
-	mv configure.in configure.ac || die
-	sed -i \
-		-e '/for i in .*\/lib/s:".*:/usr/lib/ ; do:' \
-		-e "/AC_SUBST.*LDFLAGS/s/\".*\"/\$PYTHON_LIBS/" \
-		acinclude.m4 || die
-	# bug #336812
-	sed -i \
-		-e '/gui nebular3.gif/s/gui//' \
-		data/texture/Makefile.am || die
-	eautoreconf
-
-	# needed, otherwise -lpython2.7 will not be found
-	python_export PYTHON PYTHON_LIBS
-}
-
-src_install() {
-	default
-
-	newicon data/texture/gui/eng/main/logo.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}
diff --git a/games-arcade/diameter/metadata.xml b/games-arcade/diameter/metadata.xml
deleted file mode 100644
index ec2759fffab8..000000000000
--- a/games-arcade/diameter/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-"Diameter" - is an arcade-style game with elements of economy and adventure.
-Project's main objective is to make a distinctive game with a storm gameplay and
-simultaneously alluring with its world. Plus, the main mood will be funny, but
-thus be serious.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gamediameter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index c9f43c649d61..cc6142eb9823 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,6 +1,4 @@
 AUX 3.36.0-drop-unnecessary-files.patch 877 BLAKE2B f9ca65d20efbf9b40220274881328584803f0395f233062d395c21ca0192399855b78ac7e7da7ee72d08a16736bd62bbc5670f6abbaa1c98500fb4f82917c66d SHA512 9435b8aa2caf1f9cd058ed5fbda629237c67cd9ff161be57947612ed093498d3060b9130e608211b174323a83ba18d528c606a50e8cc156aa394f192a1192d93
-DIST gnome-nibbles-3.36.0.tar.xz 317624 BLAKE2B 6b9a582964ba03520e83900bdf00043133edac3ec3fd63a183687875026f70349efa737fd0f6e27fa2feeaf577f1e2957bd02a24213c2ddd573f6fae7c695922 SHA512 f7753589e2bab5d87528cf5dd4365fdc0920555d480cac225f99a9bb5b6c5670779d43602ce8f715c6a185a304c606a1121fb139eb493df69d17a40dffa8d4a4
 DIST gnome-nibbles-3.36.1.tar.xz 323740 BLAKE2B d862900d6419505888bf3f416bb52af60186d6a3f7cb8fb52dc48fb94c3a1b99f80d262455aee335435cfef7c1573fa550d0f7595487757784a44d5e15192c3d SHA512 f7fd5c70a2ebd91d21bde26362777cecbb05bf352c13489596cbf4699f88bf93ee630a1420e91d5929ebaf05271a9006440060182d4aab9801a293559b3f2a77
-EBUILD gnome-nibbles-3.36.0.ebuild 978 BLAKE2B 92f3763630107762c69c8befd29054a09ec54e78e0f1a960f1bcb57e4c7497ec1e2661abd8178df310c80c0a18d326cc0aa31328290652f9ace26a93a08636bf SHA512 d318a830738f20344d35f45463d9a4ed36ba746edd6c234fcaa320d900cdbd15b4c366d9c67991cf610e8219a0fd02d88a410eb4957a20615664f3cec46c2aa5
 EBUILD gnome-nibbles-3.36.1.ebuild 979 BLAKE2B 841960fcf7184222cf24c9f85bff39a799202beada93f98895339f3556673d529c1b376a65923efa18b6ed5edbe880afc236ae0b6ad27031760d774ba6d125ad SHA512 493083217bb4ef95016392d1ba686b590bca7cc194b5bd31408f6df2285d1c92905daa1f4859982a08aa44d4c94316109ab8b64ff76f78ee6c1e4d36f5a1fac8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild
deleted file mode 100644
index d35b63cbd280..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=media-libs/clutter-1.22.0:1.0
-	>=media-libs/clutter-gtk-1.4.0:1.0
-	dev-libs/libgee:0.8=
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.18.0:3
-	dev-libs/libgnome-games-support:1=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-drop-unnecessary-files.patch # https://gitlab.gnome.org/GNOME/gnome-nibbles/merge_requests/11
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index 892fa7d01d4f..8c0f5968db67 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-robots-3.36.0.tar.xz 425616 BLAKE2B 1d5a3a0a087ace46af17fd97d7c284ba722d9bec22b9694ebd16b3d18fe1d87e656c6dcfc7b4687c60ea5015577c8319d967b8ad705d3d4d5e398df35c392068 SHA512 8e5eb03f74c1092c26148d0818c9e8118144dbb70c6cb25db449316ede05ff892a9ad06df2e8dc9942fe8c4f5ae638a1c8a8cda381f78f6f01a80c19010df35a
 DIST gnome-robots-3.36.1.tar.xz 428080 BLAKE2B 8026bcc2a58f3fd55daa2748b283f759c1c395766d2a64c857587a7a76e3ea27589fadf84628faf2a58b8e59e854b07630b36cd86275cd5f0fcaad58f6382755 SHA512 384506dac87818cfb9e8e72527a70adedcf01db91d18ac2bf8ac7dace68fc19429e3f15a4ff4b7e452595a3e9ae92201169ed30b687de6ef1b80b6d53c288125
-EBUILD gnome-robots-3.36.0.ebuild 738 BLAKE2B dcc2fe204e28e7bc0f2b2d6b49d1e1d7273eb7f2ac8d57f24b17630b9015c2607b15ce38e172fa8353ecc6a9502225f2da9febc6f7cf48870c3afd848c916ec9 SHA512 209fccbf998b29a8ea6dc6f7d1597f4ccd02cd0629894464841fddd85c43082003398ac1033e1e518c26807101643f09298d08bf1c7c5e1b675a7d48940ce829
 EBUILD gnome-robots-3.36.1.ebuild 738 BLAKE2B dcc2fe204e28e7bc0f2b2d6b49d1e1d7273eb7f2ac8d57f24b17630b9015c2607b15ce38e172fa8353ecc6a9502225f2da9febc6f7cf48870c3afd848c916ec9 SHA512 209fccbf998b29a8ea6dc6f7d1597f4ccd02cd0629894464841fddd85c43082003398ac1033e1e518c26807101643f09298d08bf1c7c5e1b675a7d48940ce829
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild b/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild
deleted file mode 100644
index f1d17dca8f3d..000000000000
--- a/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Avoid the robots and make them crash into each other"
-HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgnome-games-support:1=
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.15:3
-	>=gnome-base/librsvg-2.36.2:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-arcade/moleinvasion/Manifest b/games-arcade/moleinvasion/Manifest
index cf53ea6b11ea..7ff07be4afbd 100644
--- a/games-arcade/moleinvasion/Manifest
+++ b/games-arcade/moleinvasion/Manifest
@@ -1,6 +1,7 @@
+AUX moleinvasion-0.4-fno-common.patch 294 BLAKE2B eda03dc6ec5c80761d722daf63f81f2d2789720e91df4a1011963a1d850b30e5f3393d7ec58eb957d35baf0f56863362426fc766f4042230d02ab2dc683b5f0f SHA512 aa9eb13ca052053a96a7872b3385b5b36c220163d04ee23e9c9bc3e200712fafbdd89767ac1091f3c32f654dd9284d669169e97eba84400a64f184f4ac68cd33
 AUX moleinvasion-0.4-opengl.patch 439 BLAKE2B 35f32fa286716f2a93555346332858bdcdcbda73dec5561f8499000098b838b9ea9b4e67a2ed0fcf096cf9a1ccf527439989f7c9eea483238e4a002966ce57fd SHA512 2599574c0b8d6d9c3824f2f79b4f86da87b7eb53447fdfce53161f4f14daa1aac5b0916052c43ad1d8952c4e5d22ea02216e24c2299f1ef282e2535621171f21
 AUX moleinvasion-0.4-underlink.patch 295 BLAKE2B 83670e6acb629ec16fbe23e9dedd1fc86c95fc7b598f140c906531af2a01061d783cbe883b943864c69fbb836d6c7c3cc2b35653ca10e0ad564c1c71e04b4dd9 SHA512 96f113a1b4863f24c2dd2ae4afb67ca90a59db3856e69f98ecdbdf651f915c43555a96e30bcf6cb729cc63ef866cd79996e4b0ce7ca56f2758694920c56179ab
 DIST MoleInvasion-0.4.tar.bz2 11213919 BLAKE2B be42f4530f86e347ca2d6d3e94203e698328c96150a82f8307080ecfef288e631dcf14f9b86003a40792e49d6ed899cd867b1ad9dc43272e9c29a784a1a48bb6 SHA512 e1d661758391c24b9daab8ba183a265b77f4b2454c8a55f8405b63a78e040491d0c1421a64736a590a574c364e43a8989ef1b958fa565419938d0c8daadbe03f
 DIST moleinvasion-music-20090731.tar.gz 83772534 BLAKE2B 46b5cedb23604a178cb5fa8dab4546219f5318490b607093f2a0be831fbbe1b7c901b6db474e2a2f590993b11934e0286f62068268b0251368da6b33070e8c25 SHA512 ca3a2d32705afbc878bd370ceb07367a175eae0ea722e92d2993b4a1c6605763922279c15bb0cc42cf1ed15d5c7f1b13c9f8e000adbebf1f709bfbd92b5e791c
-EBUILD moleinvasion-0.4-r2.ebuild 1107 BLAKE2B 7ec10fefc0ce81fea498e2c305695552e926d51b11a74ec351156b3fe7b59b615bc920fcf9f88a8e45a285819cebf55d9f73e93c35e2a651f12bc73fed706dd6 SHA512 4c89a1d7e71a8ce5228348136420eee82a33fafd48b520cfb26bd9463703d3ed6cfdd2fde6d047d2168e0fa70330a9b0bda086741dd985ab4dfb1dacd1f0c172
+EBUILD moleinvasion-0.4-r2.ebuild 1239 BLAKE2B c1a6f79b888d7a57c68837740a7cc030082b80fabc0511309f66c0dd00bb017f69675e7e3e1c5c030e33fdae82f0a7ad960d380bc8d93465f5cbcb017638776e SHA512 b17c49677843ed07fdb98128418d13421b2d0c0a54aab32ec8ccf613eeaf0c68a7b32ad936598ad45959045c6e14d32db4e495311ec633e474bde3d9153e0d0b
 MISC metadata.xml 333 BLAKE2B 0682ce190ac920412cd383e548d541d1f7065ae269090fad7123fcfeef0b5c3678e0e3ade79db7c2735345b1c0ba6a565f33b89c239b2b549d865e923fdc9e6e SHA512 3ffaaeb4a0358f39d4fa18f074b91134d40bbca73244de5a8a2f5049c851130a8483c23e0917d662c42e79c5a516a820796682bc0d995497ad64fb8be6e94f19
diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch
new file mode 100644
index 000000000000..3d1833148792
--- /dev/null
+++ b/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/worldmap.h
++++ b/worldmap.h
+@@ -24,7 +24,7 @@
+ void draw_level_name(int current_level,myList * all_level_desc);
+ 
+ /* on stocke ici toutes les datas evoluant relatives au monde en cours */
+-#ifdef MAIN_WORLDMAP
++#ifndef MAIN_WORLDMAP
+ #define EXTERN_WLD extern
+ #else
+ #define EXTERN_WLD
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
index 885dd1d1524f..91e9e1aa5d0a 100644
--- a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
+++ b/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Mole infested 2D platform game"
 HOMEPAGE="http://moleinvasion.tuxfamily.org/"
-SRC_URI="ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2
+SRC_URI="
+	ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2
 	music? ( mirror://gentoo/${PN}-music-20090731.tar.gz )"
 
 LICENSE="GPL-2"
@@ -14,19 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="music"
 
-DEPEND="media-libs/libsdl[opengl,video]
-	virtual/opengl
+DEPEND="
+	media-libs/libsdl[opengl,video]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf
-"
+	virtual/opengl"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}/src"
 
 src_prepare() {
 	default
-	use music && mv -f "${WORKDIR}"/music ../
+
+	if use music; then
+		mv -f "${WORKDIR}"/music ../ || die
+	fi
+
 	sed -i \
 		-e '/^CFLAGS/s:= -g:+=:' \
 		-e '/^LDFLAGS/d' \
@@ -34,13 +40,20 @@ src_prepare() {
 		-e "/^FINALDATADIR/s:/usr.*:/usr/share/${PN}:" \
 		Makefile || die "sed failed"
 
-	eapply "${FILESDIR}"/${P}-opengl.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+	eapply \
+		"${FILESDIR}"/${P}-opengl.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-fno-common.patch
+}
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	emake DESTDIR="${D}" install install-data
-	newicon ../gfx/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Mole Invasion"
 	doman ../debian/*.6
+
+	newicon ../gfx/icon.xpm moleinvasion.xpm
+	make_desktop_entry moleinvasion "Mole Invasion"
 }
diff --git a/games-arcade/primateplunge/Manifest b/games-arcade/primateplunge/Manifest
index 97cd8ebaa58a..20d11989fb25 100644
--- a/games-arcade/primateplunge/Manifest
+++ b/games-arcade/primateplunge/Manifest
@@ -1,4 +1,5 @@
 AUX primateplunge-1.1-AC_SUBST.patch 619 BLAKE2B 3252eb57e4c3352f3706abb6cf6ebc26fd8d8151548e8c4aa32eaace0dbcb0c5b90d313f9631f84e0eb46781143922da10638318e118925d95f2cf0a318c9fab SHA512 f8d584b8a305ac54b91a6746613361f60cb74e6c756f1067f6d3e6ffec71f3358c64f5901e44c3a1d423d5b8624e5c34086fe7f3d63df9cb86db0d558a08b7c2
+AUX primateplunge-1.1-fno-common.patch 198 BLAKE2B b6c82b5daface9b27d20da7929105978aec5f3cd90e02ae781dc8a06aa234e65e47a4bd9cde24d185a06ebdcedea73c767d4d8da073abe3e671c9d5c2625b459 SHA512 aa0793cae353df3fd357531657287460a6ac258d9dc52a612a9a703e989360a2a96142299eebf0d06de1d6c569254cbfca3809d4112e51fd91adebdd5e9a09ba
 DIST primateplunge-1.1.tar.gz 5245884 BLAKE2B a1496eea4c99dd52f301aa50b6831ce6efffa78e45b97be13e93f64d4c4dd814b87fac17612fb82f994ee125375c75a47d3968b379c7622d78c76cadf5567e3b SHA512 bdc6be0faf28375941e67895c498f59a529521ba46d6b23ea94d3b16ead1541738d7aa5cfa5fa5cf269e7e474ca9002180e7b0663e1b4531300d21564df41b8c
-EBUILD primateplunge-1.1-r2.ebuild 736 BLAKE2B b3a7f0461b7b7972be9db12cb5a80ff4f0eab9969a70acb79607b26ffaddda55b02bb488c33a0534ad01a5fa16615dcf64a3e9221b30e8fd6c9c899c96cb4842 SHA512 2856fae1e1ae2e6f759df9b1cb6cb472218ed5a26d2b4787a147c8cc30f50bfac649f00e1840b7efba14365596e19c6aaa553852f3c4c235f3723c466b9bb438
+EBUILD primateplunge-1.1-r2.ebuild 796 BLAKE2B 06be8800ea3d391811cebee9ef496b5bcdac14db2b33fc72c835af4f5206667ff6df5d970d8310d3b8f3b7ccf34ee29bbc240508624d2b7fa4b1b0996416c739 SHA512 620139cb79b6cdcab83eaaca6e2ee44ed5099bb2cad2d02acff0416677696277a394ff632256845d0968378ada1aad7023d67235d23a3f5865934f3edc8482bd
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
new file mode 100644
index 000000000000..7905b0372e72
--- /dev/null
+++ b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/game.h
++++ b/src/game.h
+@@ -125,7 +125,7 @@
+ 
+ 
+ /* Glabals in main.c */
+-SDL_Surface *mainScreen;
++extern SDL_Surface *mainScreen;
+ 
+ /* Globals in game.c */
+ extern world* currentWorld;
diff --git a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
index 4023588bfee4..b14ba0d459b0 100644
--- a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
+++ b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas"
@@ -11,22 +12,27 @@ SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz"
 LICENSE="Primate-Plunge"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" #465850
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-AC_SUBST.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-AC_SUBST.patch
 	eautoreconf
 }
 
 src_install() {
 	default
 	dodoc TIPS
-	newicon graphics/idle.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Primate Plunge" /usr/share/pixmaps/${PN}.bmp
+
+	newicon graphics/idle.bmp primateplunge.bmp
+	make_desktop_entry primateplunge "Primate Plunge" /usr/share/pixmaps/primateplunge.bmp
 }
diff --git a/games-arcade/sdlroids/Manifest b/games-arcade/sdlroids/Manifest
index 44e88c114857..1c901f1eb247 100644
--- a/games-arcade/sdlroids/Manifest
+++ b/games-arcade/sdlroids/Manifest
@@ -1,4 +1,6 @@
-AUX 1.3.4-sound.patch 658 BLAKE2B c7a9a46881e1f8f9d9c48e843338bc9c61a1a3cda4d8f3ca27f9e47410f0e40eca039bbf3069c8be2bdb23f97e9b02a1dc3e955e07b5191c54dceafc12f29782 SHA512 4d01491aa3a57c9ea43cb15e815e761e78cae50c8f4c7abce4b02c2343ad7671b688d81da94bbca8036d081b427a08791e0332e3fb3fdad71ba41b15f291a619
+AUX sdlroids-1.3.4-Makefile.patch 560 BLAKE2B 58c48f839eb49f783c651e3ad17b28be932fdc75ef7a19589c5b5e20103c0b4721ada73187c0017d2a579f73b0d0830e464fd71e5de7778132a5f888bf8db73f SHA512 6bd3c721fb8bb64931ea5be54aed91f3db2b393f5b95df2b3d22a847979807505d1bb4ec60d1d0785f1f680ca7f3caad612757ac2289e1e7a66953d28848f93f
+AUX sdlroids-1.3.4-fno-common.patch 3072 BLAKE2B 15db2f2e74066e244c10ddb59728c78d4880782a124bc9b6419e104a12f1520800b021d973d6b306abd3430c343357ef9edf1e0d1eba6a3c5eb93c2474125933 SHA512 cc72948fc0f2c6f685f86a54b496b02e669c6713981c3f760bfcc1138e8aa3079396ada38adf6ca6b8dadd551c9cc755b8ce6e8d38634c9610592866182e659e
+AUX sdlroids-1.3.4-sound.patch 658 BLAKE2B c7a9a46881e1f8f9d9c48e843338bc9c61a1a3cda4d8f3ca27f9e47410f0e40eca039bbf3069c8be2bdb23f97e9b02a1dc3e955e07b5191c54dceafc12f29782 SHA512 4d01491aa3a57c9ea43cb15e815e761e78cae50c8f4c7abce4b02c2343ad7671b688d81da94bbca8036d081b427a08791e0332e3fb3fdad71ba41b15f291a619
 DIST sdlroids-1.3.4.tar.bz2 136588 BLAKE2B e2dd15c0437184af557f96daaa11d9b50ae991e7c29ccd3e4a27f2668719d0f7ef8244e681bdac2d8726b1493175ab4a3f754daf0f471f606bcb5cbe1b5aa1c8 SHA512 abd202e462ac96781481defb9442f3ee69cbfafb5b4e82ae435dca23068257c3e65ba4886c0c41f2568a8568b52267ded24b8684efb3f7cafd21754103cc31b4
-EBUILD sdlroids-1.3.4-r4.ebuild 735 BLAKE2B 0458e0d6827e63d09a6989ef327a39a095c45f52402a088a361cd2b200dc48f8dd64bbf7035d7bd3e488c6e8eb50330f9c7e96a88954227d675136b95beb43d5 SHA512 6e673a7cdc0e5e96c033f2dcb5da96ac4fbff88ed595f70a965c11931b0748bbdf6b948c81c98106dac2bbeadf7416bc81e24fe6aa4d2ddcb65351d19a75c7b7
+EBUILD sdlroids-1.3.4-r4.ebuild 723 BLAKE2B eb26b871ea5583228670ecc0b79e51c3c1bf5d105fc47c6d2a38ccd52d2d8a34145a71b6398e4eb8a2db6809c32a97d9ecb2574e873a5fda9f4822708259172c SHA512 31f43275d101baf2509367dad71de22a5b04a0b8320d7e0aea0b1c9e8ca6148d8f3970a54ebe8605100f0f415b0857c4f35630bc966c59f6d1c87b5d8956df01
 MISC metadata.xml 331 BLAKE2B 6d663f6943fa4c3419e12335c8d6c4913ad7658635d37889373a3b90bb7fb810cc80478d41eee57e2cda6099b7b3b748bd7583b248be2543293e6d48d5ccbe42 SHA512 b126b6b4997b53170da871ca8cf66be75350ad1b2492a62f99b8a512eab5ce63a8ededd8794ca480ecf711a4e585e0b81d77b4f1fa0dcee500c54bd48878305b
diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch
new file mode 100644
index 000000000000..9577d4cb6582
--- /dev/null
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,9 +23,9 @@
+ GFXDIR="$(datadir)/sdlroids/bmp/"
+ 
+ install-data-local:
+-	@/bin/sh $(srcdir)/mkinstalldirs $(SOUNDSDIR) $(GFXDIR)
+-	$(INSTALL_DATA) $(srcdir)/sounds/*.wav $(SOUNDSDIR)
+-	$(INSTALL_DATA)  $(srcdir)/bmp/*.bmp $(GFXDIR)
++	@/bin/sh $(srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDSDIR) $(DESTDIR)$(GFXDIR)
++	$(INSTALL_DATA) $(srcdir)/sounds/*.wav $(DESTDIR)$(SOUNDSDIR)
++	$(INSTALL_DATA) $(srcdir)/bmp/*.bmp $(DESTDIR)$(GFXDIR)
+ 
+ # Data directories
+ INCLUDES=-Wall 	-Wcast-align -DDATADIR=\"$(datadir)/sdlroids/\"
diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch
new file mode 100644
index 000000000000..6288adf913b1
--- /dev/null
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch
@@ -0,0 +1,140 @@
+--- a/getargs.h
++++ b/getargs.h
+@@ -37,4 +37,4 @@
+ 
+ /* getargs() prototype */
+ void getargs(int, char *[]);
+-int flagargs[NUMARGS];
++extern int flagargs[NUMARGS];
+--- a/sdl.c
++++ b/sdl.c
+@@ -282,7 +282,7 @@
+ #define SGN(a)		(((a)<0) ? -1 : 1)
+ 
+ /* Draw an horizontal line in the current color */
+-inline void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y)
++void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y)
+ {
+   int i;
+   if (x1 < x2) {
+@@ -296,7 +296,7 @@
+ }
+ 
+ /* Draw an vertical line in the current color */
+-inline void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2)
++void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2)
+ {
+   int i;
+   if (y1 < y2) {
+@@ -310,7 +310,7 @@
+ }
+ 
+ /* Draw a line between two coordinates */
+-inline void drawline(int x1,int y1,int x2,int y2)
++void drawline(int x1,int y1,int x2,int y2)
+ {
+   int d, x, y, ax, ay, sx, sy, dx, dy;
+   if((dx = x2 - x1) == 0) { /* vertical line */
+@@ -358,7 +358,7 @@
+   }
+ }
+ 
+-inline void MoveTo(int x,int y)
++void MoveTo(int x,int y)
+ {
+   current_x = convx(x);
+   current_y = convy(y);
+@@ -366,12 +366,12 @@
+ 
+ 
+ /* Scaling blit function by Greg Velichansky */
+-inline Uint32 ifloor(Uint32 i)
++Uint32 ifloor(Uint32 i)
+ {
+   return i & 0xFFFF0000;
+ }
+ 
+-inline Uint32 iceil(Uint32 i)
++Uint32 iceil(Uint32 i)
+ {
+   return (i & 0xFFFF) ? i : ifloor(i) + (1<<16);
+ }
+@@ -379,7 +379,7 @@
+ 
+ /* The most pedantic-a%& getpixel and putpixel ever, hopefully. */
+ /* There may still be endianness bugs! These will be fixed after adequte testing. XXX XXX XXX */
+-inline int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y,
++int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y,
+ 			 Uint8 *r, Uint8 *g, Uint8 *b)
+ {
+   /*const Uint32 mask[] = {0x0, 0xff, 0xffff, 0xffffff, 0xffffffff};*/
+@@ -515,7 +515,7 @@
+     SDL_UnlockSurface(screen);
+   }
+ }
+-inline void lock_graphics() {
++void lock_graphics() {
+   if ( SDL_MUSTLOCK(screen) ) {
+     if ( SDL_LockSurface(screen) < 0 ) {
+       return;
+@@ -523,13 +523,13 @@
+   }
+ }
+ 
+-inline void ResetRefreshCoords()
++void ResetRefreshCoords()
+ {
+   minx = miny = -1;
+   maxx = maxy = 0;
+ }
+ 
+-inline void RedrawObject() {
++void RedrawObject() {
+   if(minx >= 0) {
+     rects[rec_counter].x = minx;
+     rects[rec_counter].y = miny;
+@@ -540,7 +540,7 @@
+ }
+ 
+ static int is_poly=0;
+-inline void LineTo(int x,int y)
++void LineTo(int x,int y)
+ {
+   x = convx(x); y = convy(y);
+   drawline(current_x,current_y,x,y);
+@@ -549,7 +549,7 @@
+ }
+ 
+ 
+-inline void Polyline(POINT *pts,int n)
++void Polyline(POINT *pts,int n)
+ {
+   int f;
+   if(n<2) return;
+@@ -560,7 +560,7 @@
+     LineTo(pts->x, pts->y);
+ }
+ 
+-inline void Circle(Sint16 x, Sint16 y, Sint32 r)
++void Circle(Sint16 x, Sint16 y, Sint32 r)
+ {
+   x = convx(x);
+   y = convy(y);  
+@@ -569,7 +569,7 @@
+ }
+ 
+ /* doesn't set current_[xy] because hyperoid.c doesn't need it to */
+-inline void SetPixel(Sint16 x, Sint16 y,Uint32 c)
++void SetPixel(Sint16 x, Sint16 y,Uint32 c)
+ {
+   current_color = c;
+   x = convx(x);
+@@ -578,7 +578,7 @@
+ }
+ 
+ 
+-inline void set_colour(int c)
++void set_colour(int c)
+ {
+   current_color = c;
+ }
diff --git a/games-arcade/sdlroids/files/1.3.4-sound.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-sound.patch
index eb2eb0c2ada4..eb2eb0c2ada4 100644
--- a/games-arcade/sdlroids/files/1.3.4-sound.patch
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-sound.patch
diff --git a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild b/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
index 5500d6870314..30d2f85a7f33 100644
--- a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
+++ b/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="Asteroids Clone for X using SDL"
 HOMEPAGE="http://david.hedbor.org/projects/sdlroids/"
@@ -11,24 +12,27 @@ SRC_URI="mirror://sourceforge/sdlroids/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sound.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e 's/$(SOUNDSDIR)/$(DESTDIR)$(SOUNDSDIR)/' \
-		-e 's/$(GFXDIR)/$(DESTDIR)$(GFXDIR)/' Makefile.in \
-		|| die "sed failed"
-	eapply "${FILESDIR}"/${PV}-sound.patch
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
 	default
+
 	newicon icons/sdlroids-48x48.xpm ${PN}.xpm
 	make_desktop_entry ${PN} SDLRoids ${PN}
 }
diff --git a/games-arcade/slimevolley/Manifest b/games-arcade/slimevolley/Manifest
index 5d3735974a20..d64d8d997fff 100644
--- a/games-arcade/slimevolley/Manifest
+++ b/games-arcade/slimevolley/Manifest
@@ -1,5 +1,6 @@
+AUX slimevolley-2.4.2-gcc10.patch 7504 BLAKE2B cf259bbb273fe1e197d1c711b972ccc800a79fdd174e60c14191e4671d5adf519e14d8bbb344f61f34186d97f3bc30233aa7ea8d306628e09a85c22d7cf40c62 SHA512 4f35642f161b35d1e6d2036daced7aafceae5018fc4522aca011b22dcd2be6b29264a857e5441dec00a522ff9b8e7d10738b359f5b0200634ca318be28a9aeae
 AUX slimevolley-2.4.2-nodatalocal.patch 746 BLAKE2B ff7a336c459395724931e613fab39c212fd06f578342ef7628a934a7b066c085af909bdd35dccac54b6b698f4628b594766caa8c8c814c30837da443a73fcec3 SHA512 e679365056b118e8cf6c5a6828709f8beed67eb2e84a1ce5082abfc0498f82624bbce6584f663cf371eaf81201e6c5bfb1619fedc99ab6395e3b87472e61bd1e
 AUX slimevolley-2.4.2-underlink.patch 232 BLAKE2B 29e3d0ed66ace5a588d6e0133a2427eebd225ff77100336426db8ad892f52ec552bc562f6edf6c8834e5915094558940254a5ef9c5e6444a7ffa415654bec7f6 SHA512 402baf0b3955d86768ea40a0eaa289cd160f06551392e653255c32f47d4aed22c33f57a67e98fb3fe28500ed6914f9b8e465737b5aa958fd3332721fb2fe419f
 DIST slimevolley_2.4.2.tar.bz2 2402839 BLAKE2B 5f3ca09b11721076c115af78117e8185b9c243efc23369f7fac4c5243e942b3b0cddd403f727cad1400a7ffbd77c080bad0d1ee123dfc015be7a98337bfbda36 SHA512 7a72329d9e22396f2e304d40370896b2c1a0ae22d5bf1769a46cad8fb1131b1ae9c16de0e5f847b8a31004df074cdeb710a28bfd1e1d94beceb1c8eb0a750680
-EBUILD slimevolley-2.4.2-r1.ebuild 797 BLAKE2B 1140430ebaf6e0ecd920abd52ab2b0037fcb0e4d66a71f8318d69efef5f7e1c3d7797cd45f9aa38394d381f3a8589d67ce054c08c79b5b77361fc71f53681095 SHA512 c8544c77b8692cad21527b6d2416d7f461a66949cab7c5d177ec0bf3303a96a6cc1dadc94d6d88a63e6eb227d5cfa2bce7ace959abe6173bc5981b171f632d8c
+EBUILD slimevolley-2.4.2-r1.ebuild 833 BLAKE2B ada3a14911f3169e9d313511f84e437a75fe253887fb8832f151934a5751d5c20792b77a9cacebd8fe1201a9dd2bd36dbf9ac36fed09c8bb5f7f3a6eaf10cb0c SHA512 98909526cbe939b12f6d8966df1c3d5e50bf62e21de98d86346cb44541321d5ddf9abf82920afdaceb926f69b59f32740501df93ce099386c0a0c39207f2f861
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/slimevolley/files/slimevolley-2.4.2-gcc10.patch b/games-arcade/slimevolley/files/slimevolley-2.4.2-gcc10.patch
new file mode 100644
index 000000000000..15338a7bfaa0
--- /dev/null
+++ b/games-arcade/slimevolley/files/slimevolley-2.4.2-gcc10.patch
@@ -0,0 +1,263 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957813
+
+--- a/src/themes.h
++++ b/src/themes.h
+@@ -41,28 +41,28 @@
+ bool _charge_theme_act(char* theme_select);
+ void _theme_suivant(bool initial);
+ 
+-char nom_theme[32];
+-char theme_act[32];
++extern char nom_theme[32];
++extern char theme_act[32];
+ 
+-int menu_decalage, menu_t_police, menu_ecart;
++extern int menu_decalage, menu_t_police, menu_ecart;
+ 
+-SDL_Color coul_txt_menu, coul_txt_dial, coul_txt_jeu, coul_filet, coul_sol, coul_fond;
++extern SDL_Color coul_txt_menu, coul_txt_dial, coul_txt_jeu, coul_filet, coul_sol, coul_fond;
+ 
+-SDL_Surface *sol, *filet, *balle_img, *fleche, *oeil, *icone_jg, *icone_jd, *icone_fen;
++extern SDL_Surface *sol, *filet, *balle_img, *fleche, *oeil, *icone_jg, *icone_jd, *icone_fen;
+ 
+-SDL_Surface **img_grand_jg, **img_grand_jd, **img_2J_jg, **img_2J_jd, **img_3J_jg, **img_3J_jd;
+-Uint8 img_max_jg, img_max_jd;
++extern SDL_Surface **img_grand_jg, **img_grand_jd, **img_2J_jg, **img_2J_jd, **img_3J_jg, **img_3J_jd;
++extern Uint8 img_max_jg, img_max_jd;
+ 
+-SDL_Surface *fond, *fond_jeu;
++extern SDL_Surface *fond, *fond_jeu;
+ 
+-TTF_Font* police; /* La police de caractères */
+-TTF_Font* police_menu;
++extern TTF_Font* police; /* La police de caractères */
++extern TTF_Font* police_menu;
+ 
+-Uint16 decalage_haut, decalage_gauche;
+-float ratio_police;
++extern Uint16 decalage_haut, decalage_gauche;
++extern float ratio_police;
+ 
+-bool th_libere;
++extern bool th_libere;
+ 
+-char* chemin_moi;
++extern char* chemin_moi;
+ 
+ #endif
+--- a/src/themes_general.c
++++ b/src/themes_general.c
+@@ -31,6 +31,21 @@
+ #define RATIO_3J .6
+ #define RATIO_IC .4
+ 
++char nom_theme[32];
++char theme_act[32];
++int menu_decalage, menu_t_police, menu_ecart;
++SDL_Color coul_txt_menu, coul_txt_dial, coul_txt_jeu, coul_filet, coul_sol, coul_fond;
++SDL_Surface *sol, *filet, *balle_img, *fleche, *oeil, *icone_jg, *icone_jd, *icone_fen;
++SDL_Surface **img_grand_jg, **img_grand_jd, **img_2J_jg, **img_2J_jd, **img_3J_jg, **img_3J_jd;
++Uint8 img_max_jg, img_max_jd;
++SDL_Surface *fond, *fond_jeu;
++TTF_Font* police; /* La police de caractères */
++TTF_Font* police_menu;
++Uint16 decalage_haut, decalage_gauche;
++float ratio_police;
++bool th_libere;
++char* chemin_moi;
++
+ SDL_Rect filet_rect = { FILET_GAUCHE, HAUT_ECRAN - HAUT_SOL - FILET_HAUT, 0, 0 };
+ SDL_Rect sol_rect = { 0, HAUT_ECRAN - HAUT_SOL, 0, 0 };
+ SDL_Rect fond_rect;
+--- a/src/slime.c
++++ b/src/slime.c
+@@ -53,6 +53,20 @@
+ 	#endif
+ #endif
+ 
++SDL_Event evenement;
++SDL_Surface *ecran; /* L'écran */
++joueur tab_joueurs[NB_JOUEURS_T]; /* Ce tableau contient les configuration des joueurs */
++touches_joueur touches[4];
++Uint8 nb_balles;
++balle_obj tab_balles[MAX_BALLES];
++config_slime conf; /* La configuration actuelle (modifiable) */
++Uint8 act_conf;
++Uint32 ev_timer(Uint32 intervalle, void* param);
++Uint16 h_ecran, l_ecran;
++bool quitter;
++bool fen_ok;
++bool plein_ecran, aff_fps, aff_sc_perm;
++
+ char conf_chemin[64] = CONFIG_NOM;
+ 
+ void afficher(char* chaine, TTF_Font* police_texte, SDL_Color coul_texte, Uint16 posX, Uint16 posY) {
+--- a/src/slime.h
++++ b/src/slime.h
+@@ -68,7 +68,7 @@
+ 	#define snprintf5(a, b, c, d, e) snprintf(a, b, c, d, e)
+ #endif
+ 
+-SDL_Event evenement;
++extern SDL_Event evenement;
+ 
+ void afficher(char* chaine, TTF_Font* police_texte, SDL_Color coul_text, Uint16 posX, Uint16 posY);
+ void aff_aide(const char* texte);
+@@ -85,23 +85,23 @@
+ 
+ /* Les variables globales nécessaires... */
+ 
+-SDL_Surface *ecran; /* L'écran */
++extern SDL_Surface *ecran; /* L'écran */
+ 
+-joueur tab_joueurs[NB_JOUEURS_T]; /* Ce tableau contient les configuration des joueurs */
+-touches_joueur touches[4];
++extern joueur tab_joueurs[NB_JOUEURS_T]; /* Ce tableau contient les configuration des joueurs */
++extern touches_joueur touches[4];
+ 
+-Uint8 nb_balles;
+-balle_obj tab_balles[MAX_BALLES];
++extern Uint8 nb_balles;
++extern balle_obj tab_balles[MAX_BALLES];
+ 
+-config_slime conf; /* La configuration actuelle (modifiable) */
++extern config_slime conf; /* La configuration actuelle (modifiable) */
+ 
+-Uint8 act_conf;
++extern Uint8 act_conf;
+ 
+-Uint32 ev_timer(Uint32 intervalle, void* param);
++extern Uint32 ev_timer(Uint32 intervalle, void* param);
+ 
+-Uint16 h_ecran, l_ecran;
++extern Uint16 h_ecran, l_ecran;
+ 
+-bool quitter;
+-bool fen_ok;
+-bool plein_ecran, aff_fps, aff_sc_perm;
++extern bool quitter;
++extern bool fen_ok;
++extern bool plein_ecran, aff_fps, aff_sc_perm;
+ #endif
+--- a/src/audio.c
++++ b/src/audio.c
+@@ -26,6 +26,10 @@
+ #include "slime.h"
+ #include "audio.h"
+ 
++bool audio_desact;
++bool son_active;
++slime_son sons[NB_SONS];
++
+ SDL_AudioSpec format_obtenu;
+ 
+ slime_son* son_act;
+--- a/src/audio.h
++++ b/src/audio.h
+@@ -40,8 +40,8 @@
+ 
+ void stop_son(void);
+ 
+-bool audio_desact;
+-bool son_active;
++extern bool audio_desact;
++extern bool son_active;
+ 
+ enum {
+ 	SON_RBD_SLIME	= 0,
+@@ -54,6 +54,6 @@
+ 	NB_SONS			= 7
+ };
+ 
+-slime_son sons[NB_SONS];
++extern slime_son sons[NB_SONS];
+ 
+ #endif
+--- a/src/reseau.c
++++ b/src/reseau.c
+@@ -34,6 +34,11 @@
+ #define PORT 2222 /* A changer aussi dans les messages */
+ #define HANDSHAKE "HelloSV241"
+ 
++Uint8 nb_reseau; /* Nombre de joueurs réseau */
++Uint8 nb_total; /* Nombre de joueurs au total */
++UDPpacket* paquet;
++Uint8 clt_id_joueur;
++
+ UDPsocket res_socket;
+ IPaddress j_adresses[NB_JOUEURS_T];
+ 
+--- a/src/reseau.h
++++ b/src/reseau.h
+@@ -48,12 +48,12 @@
+ Uint8 connecte_client(char* addr_ip);
+ void deconnecte_client(void);
+ 
+-Uint8 nb_reseau; /* Nombre de joueurs réseau */
+-Uint8 nb_total; /* Nombre de joueurs au total */
++extern Uint8 nb_reseau; /* Nombre de joueurs réseau */
++extern Uint8 nb_total; /* Nombre de joueurs au total */
+ 
+-UDPpacket* paquet;
++extern UDPpacket* paquet;
+ 
+-Uint8 clt_id_joueur;
++extern Uint8 clt_id_joueur;
+ 
+ #endif
+ #endif
+--- a/src/menu.c
++++ b/src/menu.c
+@@ -31,6 +31,11 @@
+ 
+ #define TEXTE_GAUCHE 170
+ 
++int decalage; /* Pour aligner les slimes par rapport au texte */
++Sint8 menu_act; /* L'élément de menu actuellement choisi */
++Uint8 menu_raf; /* L'élément de menu actuellement rafraichi */
++Sint8 action; /* Indique la touche pressée par l'utilisateur (gauche/retour/droite) */
++
+ void affiche_menu(menu_elem* fonctions, Uint8 n, char* nom_retour) {
+ 	Uint8 i;
+ 
+--- a/src/menu.h
++++ b/src/menu.h
+@@ -41,10 +41,10 @@
+ 
+ void affiche_menu(menu_elem* fonctions, Uint8 n, char* nom_retour);
+ 
+-int decalage; /* Pour aligner les slimes par rapport au texte */
++extern int decalage; /* Pour aligner les slimes par rapport au texte */
+ 
+-Sint8 menu_act; /* L'élément de menu actuellement choisi */
+-Uint8 menu_raf; /* L'élément de menu actuellement rafraichi */
+-Sint8 action; /* Indique la touche pressée par l'utilisateur (gauche/retour/droite) */
++extern Sint8 menu_act; /* L'élément de menu actuellement choisi */
++extern Uint8 menu_raf; /* L'élément de menu actuellement rafraichi */
++extern Sint8 action; /* Indique la touche pressée par l'utilisateur (gauche/retour/droite) */
+ 
+ #endif
+--- a/src/menu_options.c
++++ b/src/menu_options.c
+@@ -26,7 +26,7 @@
+ #include "reseau.h"
+ #include "audio.h"
+ 
+-char tmp_chaine[64];
++static char tmp_chaine[64];
+ 
+ void m_touches_act(void) {
+ 	configClavier();
+--- a/src/menu_princ.c
++++ b/src/menu_princ.c
+@@ -27,7 +27,7 @@
+ #include "slime.h"
+ #include "themes.h"
+ 
+-char tmp_chaine[64];
++static char tmp_chaine[64];
+ 
+ char* m_vitesse_aff(void) {
+ 	const char* noms_confs[] = { N_("normal"), N_("turbo"), N_("sprint") , N_("fury") };
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
index 5d5491639d34..fb1eb3bc1e45 100644
--- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
+++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
@@ -12,7 +12,6 @@ SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	sys-devel/gettext
@@ -31,6 +30,7 @@ DOCS=( docs/{README,TODO} )
 PATCHES=(
 	"${FILESDIR}"/${P}-nodatalocal.patch
 	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-gcc10.patch
 )
 
 S="${WORKDIR}/${PN}"
@@ -38,7 +38,7 @@ S="${WORKDIR}/${PN}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DDATA_DIR=/usr/share/slimevolley
+		-DDATA_DIR="${EPREFIX}/usr/share/slimevolley"
 	)
 	cmake_src_configure
 }
diff --git a/games-arcade/spout/Manifest b/games-arcade/spout/Manifest
index 01668a7770ed..376a8cd202ba 100644
--- a/games-arcade/spout/Manifest
+++ b/games-arcade/spout/Manifest
@@ -1,3 +1,4 @@
+AUX spout-1.3-fno-common.patch 279 BLAKE2B 173f83694ef3c55590436ba144efc56a9f1082dce69efaf3d53d3243d485f8fa993af9c9c1b7fc50bb75e44cbf51f6c0018bdc4727390e4a99e1b7b572d726d1 SHA512 cccdc26be30bf00f9539841db74e809edf088dad6130731ba1323975d5926bb3e392ad10dc830f13c9ffc5ce2a4a086e0f00955f5f44a2c234f5846e71f781ce
 DIST spout-unix-1.3.tar.bz2 92144 BLAKE2B 4512a3f47fddfbed7471fe81f8a7fa296f44aa12b3e3b69c0d665a4f95c82508460ab007a798c098ccbea68f1ccc827699f8428203e1217ea7a493e96810771c SHA512 46ed12a617a4084e8a5d1da56799fe7784ed288a254385b109ced6138ce904e658a44af445c1577112a3701a0b108fc886e3d06df41743b0d82b028eb8a846d6
-EBUILD spout-1.3-r1.ebuild 950 BLAKE2B 3d90cd177f4021ea00186972958f219cfb919c0dcca3681cacaa27a569e89a63d62f08b17efa28f415c170a097d22dde6cf5a3c09a63fad2ebef85ed92a0db7a SHA512 ad64a1b01e46844d6e947d86f54f0be893f5248ec623930fd1468e08d3fa9533501f1507b1ed34a1dfb15fe2728468c21e2236336ea08146da634e027b640a2a
+EBUILD spout-1.3-r1.ebuild 976 BLAKE2B 7075eb905cab36076e0f252d91dd00259a236099e630810ca67dd5d126b2ae9c3da152a53eb9ca4eaadcb5690dde12096a97afdf07202f0ece5153bacc6828ae SHA512 978ea480a2a342cb96f6e232c6f536364852cb12b949e97ea52aa445179e535cc72b61e8b7e92028d80b1447b19d63a7a2aa4c47e49d27ca4b38f456a92357f6
 MISC metadata.xml 326 BLAKE2B 850fd4b72c1d6f35416e4950315f83ad45cb8f30baad1c103497f5829b36417e578ef45e43218b2cac33a464a728580fb4fa7ff0a769e0d634d0bdd237d5b6bd SHA512 6dcfdd1cb6906123842e4cc0262237fff7f99f1744cf1a798e42d42da560e866b16f898a71d996cdcdd27d818f92dbd19745a023cd963f9d762e49003beb92ea
diff --git a/games-arcade/spout/files/spout-1.3-fno-common.patch b/games-arcade/spout/files/spout-1.3-fno-common.patch
new file mode 100644
index 000000000000..37c1098b0826
--- /dev/null
+++ b/games-arcade/spout/files/spout-1.3-fno-common.patch
@@ -0,0 +1,18 @@
+--- a/piece.c
++++ b/piece.c
+@@ -11,6 +11,7 @@
+ 
+ SDL_Surface *video, *layer;
+ SDL_Rect layerRect;
++int zoom, fullscreen;
+ 
+ unsigned char *vBuffer = NULL;
+ 
+--- a/piece.h
++++ b/piece.h
+@@ -53,4 +53,4 @@
+ 
+ int pcePadGet ();
+ 
+-int zoom, fullscreen;
++extern int zoom, fullscreen;
diff --git a/games-arcade/spout/spout-1.3-r1.ebuild b/games-arcade/spout/spout-1.3-r1.ebuild
index 876b18d55681..2057b0f1b3be 100644
--- a/games-arcade/spout/spout-1.3-r1.ebuild
+++ b/games-arcade/spout/spout-1.3-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop readme.gentoo-r1
 
 MY_P="spout-unix-${PV}"
+
 DESCRIPTION="Abstract Japanese caveflier / shooter"
 HOMEPAGE="http://freshmeat.net/projects/spout/"
 SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2"
@@ -12,31 +14,31 @@ SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.6"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-To play in fullscreen mode, do 'spout f'.
-To play in a greater resolution, do 'spout x', where
-x is an integer; the larger x is, the higher the resolution.
-
-To play:
-* Accelerate - spacebar, enter, z, x
-* Pause - escape
-* Exit - shift+escape
-* Rotate - left or right
-"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_install() {
 	dobin spout
+	einstalldocs
+
 	doicon spout.png
 	make_desktop_entry spout "Spout"
-	einstalldocs
+
+	local DOC_CONTENTS="
+	To play in fullscreen mode, do 'spout f'.
+	To play in a greater resolution, do 'spout x', where
+	x is an integer; the larger x is, the higher the resolution.
+
+	To play:
+	* Accelerate - spacebar, enter, z, x
+	* Pause - escape
+	* Exit - shift+escape
+	* Rotate - left or right"
 	readme.gentoo_create_doc
 }
 
diff --git a/games-arcade/xrick/Manifest b/games-arcade/xrick/Manifest
index db8d33e76ef8..4a7f34440b04 100644
--- a/games-arcade/xrick/Manifest
+++ b/games-arcade/xrick/Manifest
@@ -1,6 +1,8 @@
+AUX xrick-021212-Makefile.patch 958 BLAKE2B 56d55101afdb995c1adbb0d7e9b6c7a112b1846f35544b987b7aba746c21d30e45056daf0d8b48769bee97d4b2cac8e0c6a42e76db32eb17505b04c17aeee25c SHA512 a517c824be40f61249f7d83ab3b148bf96e053b44ddc3506c5780cc2a554192e0b7d096b2a2466a7cb63b2400a9d14c8c077f2ab5acdbd6c1c1c643239c113fa
 AUX xrick-021212-exit.patch 702 BLAKE2B 58323696fb2abde318706e0d37c50d31d7bc65ce3a86163991019d2d43675dcc5d6562d65e13d96a0476164bc1dfd6db1270e63e405449d798cb5996dc9e6b6d SHA512 8d22419f6912297a900d3ad7101684af1c52c093ea3ea513aea52220b41b5b2a5c2b474883da887b4160b16ab3c9f90a885e48694a48a68470083b643be6d551
+AUX xrick-021212-fno-common.patch 630 BLAKE2B 434dea82a782d0ac2dc805a584e50e767c8b2e7bade10706f7fcce84fd455df868d68c38e014e465a854ad56b5eeff50a36befe7aee1d74faf7f6d3fd2784a00 SHA512 2face5e4732eb6b82782fa169cd164d745cef26a4ce07d2cfacc79a4653658e404dc17b455fd36ad8fd346347f296624df09db3389a8bc65ee44fac09ca2b045
 AUX xrick-021212-fullscreen.patch 950 BLAKE2B e46b147ef3283f64d985b2e6fa1445b31c27c29a28a6a5859ff420ebc3bda2a15e633f85799cd2c32751ec25e726c6a57f13cead5d6b0829572f3a1a29e10ec8 SHA512 694d56f9094483bf5e11b905bb21408a684669b3c6d1fc150de8c1300b56ca2349dfbceefff5c936328eb202776bc3f5b6ea74b54ffbb082de27aa7827d7ce7c
 AUX xrick-021212-zlib.patch 372 BLAKE2B 9811ee9464790c7cb804a06a3f8cc71dff3489ae00bf30f7f56e8bf10f88d7d2eed5c92abda943a47d7913a4885f5f04b0fbfa41afc7653028fa23f86dbcaf35 SHA512 48933852c71f2979ae865fb72e89edeb7a3d314710472bd572e37877ff5fc627ecaa9c39661f8968c19d1e8b3e820600ab0d9985da029739cb78abedd2ff7d0f
 DIST xrick-021212.tgz 1648538 BLAKE2B d8ba387f4645d4ef0fd97b346ee202fb8573fd694e4f278791115ea5a2ab6ca509a8fffec3c5754e0160eec919aaa7a90509858bd80ae0244f28c32055070636 SHA512 7a6547dfce586512c3c4aa7fd5aa0d7d8bd223dbec6a9211e858034bd73d44f168266441d8f3475cddbed8f3a19c7c0df31345b62e2ecfb860664e54facb48bf
-EBUILD xrick-021212-r2.ebuild 1179 BLAKE2B 923090bf081e886e7420342cc74e43fbb22b89f7e4b618d5df0c9daf20011beb8fde46df9ee9bfbb91341c44029a3ec4f70c6e0a0fbb8926e7f02adad6b425e8 SHA512 1beecdd448a4da07078c44f581e91b851fb77dd823cbd2eacee9df40f6cf9b7204e7d8b20c13a631302e8654629662495bd39fbcd5f67ca838d97f350d2fce5d
+EBUILD xrick-021212-r2.ebuild 1220 BLAKE2B 27b42530e71377c1eef000c0c1275e9edc6358cf0ad63ec173f2d0a4f11be155b633900d550ea790514aa76a8b2babef2e4710697346158c4a38a8942acde66b SHA512 a00aa2799519bf468f54391da8979ec51716aa919b75fecf6cd53c016bd7ce06033a300656bd3c9b8514874c24388829ac08847af46e6733887eb0d149571e9c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xrick/files/xrick-021212-Makefile.patch b/games-arcade/xrick/files/xrick-021212-Makefile.patch
new file mode 100644
index 000000000000..2911f4715d45
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-Makefile.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -71,10 +71,8 @@
+ all:
+ 	@echo "ROOTDIR=$(ROOTDIR)" > Makefile.global
+ 	@echo "XOBJ=$(XOBJ)" >> Makefile.global
+-	@echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global
+-	@echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global
+-	@echo "CC=gcc" >> Makefile.global
+-	@echo "CPP=gcc -E" >> Makefile.global
++	@echo "CFLAGS+=-pedantic -Wall -I$(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global
++	@echo "LIBS+=-lz $(shell sdl-config --libs)" >> Makefile.global
+ 	$(MAKE) -C src all
+ 
+ clean:
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -40,10 +40,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS) $(XOBJ)
+-	$(CC) $(OBJECTS) $(XOBJ) $(LDFLAGS) -o $(TARGET)
++	$(CC) $(LDFLAGS) $(OBJECTS) $(XOBJ) -o $(TARGET) $(LIBS)
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ xrick.res: xrick.rc
+ 	windres $< -O coff -o $@
diff --git a/games-arcade/xrick/files/xrick-021212-fno-common.patch b/games-arcade/xrick/files/xrick-021212-fno-common.patch
new file mode 100644
index 000000000000..d3c05c30dbef
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-fno-common.patch
@@ -0,0 +1,34 @@
+--- a/include/img.h
++++ b/include/img.h
+@@ -27,7 +27,7 @@
+   U8 *pixels;
+ } img_t;
+ 
+-img_t *IMG_SPLASH;
++extern img_t *IMG_SPLASH;
+ 
+ #endif
+ 
+--- a/src/dat_snd.c
++++ b/src/dat_snd.c
+@@ -19,14 +19,14 @@
+ 
+ sound_t *WAV_WAA;
+ sound_t *WAV_BOMB;
+-sound_t *WAV_BULLET;
+-sound_t *WAV_WALK;
+-sound_t *WAV_JUMP;
++extern sound_t *WAV_BULLET;
++extern sound_t *WAV_WALK;
++extern sound_t *WAV_JUMP;
+ sound_t *WAV_TING;
+-sound_t *WAV_BOMBSHHT;
+-sound_t *WAV_BONUS;
++extern sound_t *WAV_BOMBSHHT;
++extern sound_t *WAV_BONUS;
+ sound_t *WAV_SHHT;
+-sound_t *WAV_BOX;
++extern sound_t *WAV_BOX;
+ sound_t *WAV_DDDING;
+ 
+ #endif /* ENABLE_SOUND */
diff --git a/games-arcade/xrick/xrick-021212-r2.ebuild b/games-arcade/xrick/xrick-021212-r2.ebuild
index c24058e2784b..3ef05387653d 100644
--- a/games-arcade/xrick/xrick-021212-r2.ebuild
+++ b/games-arcade/xrick/xrick-021212-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's"
 HOMEPAGE="http://www.bigorno.net/xrick/"
@@ -11,44 +12,51 @@ SRC_URI="http://www.bigorno.net/xrick/${P}.tgz"
 LICENSE="GPL-1+ xrick"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" # bug #149097
 
 DEPEND="media-libs/libsdl[video]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-exit.patch
+	"${FILESDIR}"/${P}-fullscreen.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}" || die
 	unpack ./xrick.6.gz
 }
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}*.patch
+
 	sed -i \
 		-e "/^run from/d" \
-		-e "/data.zip/ s:the directory where xrick is:$(get_libdir)/${PN}.:" \
+		-e "/data.zip/ s:the directory where xrick is:$(get_libdir)/xrick.:" \
 		xrick.6 || die
 
 	sed -i \
-		-e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \
+		-e "s:data.zip:${EPREFIX}/usr/$(get_libdir)/xrick/data.zip:" \
 		src/xrick.c || die
+}
 
-	sed -i \
-		-e "s/-g -ansi -pedantic -Wall -W -O2/${CFLAGS}/" \
-		-e '/LDFLAGS/s/=/+=/' \
-		-e '/CC=/d' \
-		-e "/CPP=/ { s/gcc/\$(CC)/; s/\"/'/g }" \
-		Makefile || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin xrick
-	insinto /usr/"$(get_libdir)"/${PN}
+
+	insinto /usr/$(get_libdir)/xrick
 	doins data.zip
-	newicon src/xrickST.ico ${PN}.ico
-	make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico
+
 	dodoc README KeyCodes
 	doman xrick.6
+
+	newicon src/xrickST.ico xrick.ico
+	make_desktop_entry xrick xrick /usr/share/pixmaps/xrick.ico
 }