gentoo resync : 25.08.2020

37 files changed, 1148 insertions, 298 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 39d62cb761fe..b25baeda5ef4 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/blobby/Manifest b/games-arcade/blobby/Manifest
index 5e888a5d2dff..ce789697489f 100644
--- a/games-arcade/blobby/Manifest
+++ b/games-arcade/blobby/Manifest
@@ -2,5 +2,5 @@ AUX blobby-1.0-compile.patch 953 BLAKE2B c946783dd30b7f10c5f8cd4db932ef1c913fc10
 AUX blobby-1.0-install.patch 669 BLAKE2B c23270394ce98e271713da8af60d8b8f510d1a6f69950485af060eacae977942b2490eb9450faaea25c6adb29a5e216356f68cfd48cb13aca97e9b4eb582d294 SHA512 ed31fd4a8f6e5c0f30bfbaf331c5b4dc51250c72481d38b556bceed673de5ee8c1fe89c5002e15125202551023e3d836937eeb1de1121e78f60c15132b5850c9
 AUX blobby-1.0-paths.patch 1237 BLAKE2B 77199702e08216ce741698b7435288f4536e6304a3fec09f2ef57bd73004d3306d9430230a2d8fdb1fc3a8018765c3a7d7662501eb6eb1caa6b29a858a96a798 SHA512 63c0ea107197ec2bed46b34d6cebbd0df1cc09477d6253ee8f325a554608456b0a34b301201e4d774c985df0512ba330105a5ec2be29ba34250a3a7311437793
 DIST blobby2-linux-1.0.tar.gz 1772918 BLAKE2B ee2231d5c2a287f812debf43a95b6ffe4abdcd87fec41eea5e528253d83190f20d4b2245b5e530f1b8b9df310ce2757b06377f7305f8cf60e6d51db9964ea239 SHA512 b9e36de4a44e482c9d0742b95034c2979d7a51512ac5e3fd8f4933655132028dfc9642c3580e5523b5b95d38acc169932d24808cee236710731c2571321337fa
-EBUILD blobby-1.0.ebuild 802 BLAKE2B c3eef011c49da2d3476e62b6baa7b9abd79d672699dbd8aa7eed95b60b1336b20fec157dfd8899a8bbdbb1949f4d588c84434486cb1f865f127a1ef17b47733d SHA512 3b493fb652e2aadf44972c007dc0506a68c7e9af33d47a04c8650fcaf1500c822f5a203b7ae59c990190c4115beb1e5deb37dd69338ed59dad7ce3e7a35e2d46
+EBUILD blobby-1.0-r1.ebuild 799 BLAKE2B 064da1e6d8fd641b6683ab62a9c47fef56efe3f0dc39875ab0060b76e916ee8cceb9aa959cca7a24332f8766d4812fb20c631c75876f73ed75e2a77ec6b6e742 SHA512 59a81ca192c6b015e8baa37cf699208387cfe8de651c5d4cfbca1368f44c08bd53b301044b8738bf7ad7e7dab226eaf0dd57e34b04310d5d61f2b92f84b4630b
 MISC metadata.xml 329 BLAKE2B 57c87f4ead15774d9253ee14454b3316e1ca30eef93f18066c039a25137258555ec8788dfab78f94be77c38bb2ebe03ce42f1046896fb323653ce04760e7b8f6 SHA512 a46248ffada14ff8459d5a6949e8d437d7fc72036c04f0c8f28b3cca614ccdb3116875f741d0dd248e172431d292761c6c1d230f1a07499b2d6cc63208ccc740
diff --git a/games-arcade/blobby/blobby-1.0.ebuild b/games-arcade/blobby/blobby-1.0-r1.ebuild
index 413ea74b1024..0044ddcffb2d 100644
--- a/games-arcade/blobby/blobby-1.0.ebuild
+++ b/games-arcade/blobby/blobby-1.0-r1.ebuild
@@ -1,9 +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
+EAPI=7
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="Beach ball game with blobs of goo"
 HOMEPAGE="https://sourceforge.net/projects/blobby/"
@@ -16,11 +16,14 @@ IUSE=""
 
 RDEPEND="
 	>=dev-games/physfs-2[zip]
-	media-libs/libsdl[sound,joystick,opengl,video,X]
-	virtual/opengl"
+	media-libs/libsdl2[sound,joystick,opengl,video]
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	app-arch/zip
 	dev-libs/boost
+"
+BDEPEND="
+	app-arch/zip
 	virtual/pkgconfig
 "
 
@@ -31,7 +34,7 @@ PATCHES=(
 )
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newicon data/Icon.bmp ${PN}.bmp
 	make_desktop_entry ${PN} "Blobby Volley" /usr/share/pixmaps/${PN}.bmp
diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
index 56a402713acb..fa519821f232 100644
--- a/games-arcade/blobwars/Manifest
+++ b/games-arcade/blobwars/Manifest
@@ -1,4 +1,4 @@
 DIST blobwars-2.00.tar.gz 66982603 BLAKE2B 273b5eab5a569f7f4b78982499a85daf63e6fdfb7d4348290d64bbcbeb9be830bb7cf81a0a387df0daa176e7a2a82d62404e88c95f02d6af485bae054170ad38 SHA512 412afd029554e59e7947466f36b51ef863faf1712898397498d5497e9a38dced92777b7684c1fb231998d893a6ce2c435b8f4278429df41168385de8fa18725b
-EBUILD blobwars-2.00-r1.ebuild 1616 BLAKE2B 713c26a8d9111f20e96a4ecb81b8351533fe110874aac2f3a6276b75b8e635039dbd78820d477dc2e15c3b732cf08f6f9c5b24a0bc1020364203c2f605e0c8f7 SHA512 6cda604671dadc10c408cc2d032a6bea24ab9364b6f1407dc4cfb2d63c8de4011fa2cdb6de05f78592f336f620013867ad5da464546428c937ed4148ce1dbd80
+EBUILD blobwars-2.00-r1.ebuild 1615 BLAKE2B e0dd859a7679e7c0ab5cee5730f765511a130f8b1b056632aa58d4ddc9739bd28239673033b605bb8d9b5823df7a1facaa8c4f55c64c6e83b673cd635cfbb7ba SHA512 cc612bdf5fdf7afc1265c1417e9e85e8a1702097d04b656b46c4f9e3cdd33ee3acb180146f95056e6e73de289eb4f155b48ee90aab12644fc70ddcaf51e91ef2
 EBUILD blobwars-2.00.ebuild 1124 BLAKE2B fae1ab03f69036eff035e706ebbcaa069ffafe3e3506915530fc6f68ee33832c9562853ab148673f3e5e70c3a216987355a9f26e4e0f30ec8359f15da8463fc3 SHA512 307dc3ab6bec986c2883e47a2520a7505f1bb7167be768ef21f6fc253c84d72c678d2fe73b232ff973e3a0ebd110b2459f68b7d0678b9952eb571a51398814a9
 MISC metadata.xml 321 BLAKE2B 615ad32064001afb9fb3a3c4038f5e36e388193fef6855f157feb05085a5a803878035a225935e1c1350b10bc483c3ebd46c38f1f365828d2807d4387ce3a6d5 SHA512 9e885b0215caa2c061cfe52c19a389227087691b6ec1bca4fcd8c7279468454b21e32027c5f1d03aafdb982b873251ee8cddcad28987085d0960e3f39ad77867
diff --git a/games-arcade/blobwars/blobwars-2.00-r1.ebuild b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
index 1d51f12f8b9d..6fee93987c85 100644
--- a/games-arcade/blobwars/blobwars-2.00-r1.ebuild
+++ b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz"
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 9b808760ce59..266e0ed162d4 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,4 +1,6 @@
 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 981 BLAKE2B b7b8feeb901c6e9b1729eef83b64dcb74e198ea80cfcb768663f3eb4d95c4676786b703bec01fd9b2b8f32ed2a0b435ffa0d88031aa4f89785d9e82e04785c85 SHA512 178f6372b8da4f74c49d7743c038469a74c697787d28101d1e335030efe18cdcfa20bd31684885b309d26dc1e89ad42a9155daec89c3bf3aaee5ec95dd6e0806
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild
new file mode 100644
index 000000000000..afb2d6c660e3
--- /dev/null
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.1.ebuild
@@ -0,0 +1,51 @@
+# 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}"/3.36.0-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 86f7255d84ab..c85c19738f2a 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,3 +1,5 @@
 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 740 BLAKE2B 32b01e5f1aea372114858a3f67dcaf143d145aa214ae90317d669c25a57e5bcecbcdc46bf1b905c83f6bf2f68750e6a16159205fff9c9919a94250f48f094053 SHA512 6d0276847cf9d419e56d3e3cd2b321beddd019376cea5a1c1e69812c0f14a26e4888a3b7376609e3020c44897579050262c6cca2ec6867f1f25cfa96bd8bdbca
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-robots/gnome-robots-3.36.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.36.1.ebuild
new file mode 100644
index 000000000000..fc66f1d18315
--- /dev/null
+++ b/games-arcade/gnome-robots/gnome-robots-3.36.1.ebuild
@@ -0,0 +1,38 @@
+# 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/insaneodyssey/Manifest b/games-arcade/insaneodyssey/Manifest
index 8445079c8599..1fd48eacebb1 100644
--- a/games-arcade/insaneodyssey/Manifest
+++ b/games-arcade/insaneodyssey/Manifest
@@ -1,5 +1,5 @@
-AUX insaneodyssey-000311-datafiles.patch 1605 BLAKE2B 2418e72f6b74dad8c00b26235ffbb8df1394d90e639994d080be3845c02f7d278c262405682d9c8ca2ac8a15b6dd5695224461fdc13f96b61dc01ea70ed20da4 SHA512 b0a7a32f5463474435e17d56169e7a5f79a624e508df8142760ba24c22625707aa409f2a5381502676a6af86b2857a2db739e36cdb2471cf4a98181e5532be8d
-AUX insaneodyssey-000311-gcc6.patch 388 BLAKE2B 4976b873e3a74992cab91d155a8ab280d689c067cbb6e66944cf8b7a4a0c82c1f0e18fab1f6c3f9339b49fd0d73ef98f4a5382bb60844afe849cde3ef5d7a99b SHA512 7f634c129bcdd1a54ec196792dbfe18b0d26823907efc92c3389b5f3280c8243cd23d8e980744673bb2cabbf7c44203e4b7ec320ebe729300566adf39d6ee1f3
+AUX insaneodyssey-000311-datafiles.patch 1556 BLAKE2B 31a555cab691c901bff9fc03959da8cccf494917618359d07977edb62aeaa39691b8614c3b8b345667af491e1eba61e68b1b68429d1ce797362f206ce8a02978 SHA512 1da7da316228616c4df55c2fa45cee880c7e1f6f9b179ed159c0f628639f6788a2914a1c23cf2d8e88241b4d8cb2a48e6717466947105f707a438b852a11657a
+AUX insaneodyssey-000311-gcc6.patch 416 BLAKE2B ddb56e283320111872bec4647f1076c5b9ea2b67c19740cd50a39716ca1bd5f55fbf80b9b85f74294dbcfaf41d67d5506b6ce6e5b14ab1d365620bc383d651f3 SHA512 d68dd504a93c4678c2db821e51074bfa17b79a5c6dc4a7c42d5654cb1fb776a0e6d00c118d8d22555068c3d61c1708cf08039900664ecaf51f8967fda558e538
 DIST io000311.tar.gz 839950 BLAKE2B 4974471c69541afcb98764a3bf7c71c72afba7e9301f540eb1af85611bada547e87b491205f9fb9ba41e6e8e52326eb5e0b4cf07bf3d02259280ea6b2e5be162 SHA512 9fbf79daf1886c31a6309036cf382c2e175e3c280d6d5aa822971e977e97227f4290474c272afd7ed8218b2cc7e66b407b37522207b30225a41488201a244d96
-EBUILD insaneodyssey-000311-r1.ebuild 1428 BLAKE2B 4abc6a58c24847da2364fa937e0bbfa752a2399e1be021dde475dcf528e3cc8706c405d9d7e99765ebd976f378e7a92399c6b750fd7a4bc4af2472cc7ad6a79b SHA512 46273e06fdddd0c40caef61f986573732a6508a398103491f6584d514af76dc8021c556439f5f3521a919df7f7debd5912590aa93695b743e4500530888c4a69
+EBUILD insaneodyssey-000311-r1.ebuild 1550 BLAKE2B 807e74321b20df81f006bcb44da1bef1606c484f8797d48b4d5645c87d81ce3e37dee8bd1d67eca697bc9dc77e6e0540b9916348a67097cc3763ce715ae0980c SHA512 0a91cfd8c74b9d77b1e43c7bfc2f5be542c2d8ec0fa3cd3e6a38d775a97863ddbd98450ef75a1fe7ebb640411aa0dfd841e95094e6433638b0d161b79e8d6dd8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
index 3aab4eeaf9da..f4114cfc8e88 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
@@ -1,5 +1,5 @@
---- a/io.cpp.orig	2004-06-01 19:11:16.000000000 +0300
-+++ b/io.cpp	2004-06-01 19:21:14.000000000 +0300
+--- a/insaneodyssey/io.cpp
++++ b/insaneodyssey/io.cpp
 @@ -42,7 +42,11 @@
  {
  	SDL_Surface *image, *surface;
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
index 4fd35438d24b..74b4bf644d49 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
@@ -1,7 +1,7 @@
 Bug: https://bugs.gentoo.org/600894
 
---- a/io.cpp
-+++ b/io.cpp
+--- a/insaneodyssey/io.cpp
++++ b/insaneodyssey/io.cpp
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
index 0383afc0b2b3..a96e26451519 100644
--- a/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
+++ b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.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="Help West Muldune escape from a futuristic mental hospital"
 HOMEPAGE="http://members.fortunecity.com/rivalentertainment/iox.html"
@@ -13,30 +14,28 @@ SRC_URI="mirror://gentoo/io${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
-	media-libs/sdl-image
-"
+	media-libs/sdl-image"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_prepare() {
-	default
-
-	cd ${PN}
-
+PATCHES=(
 	# Modify data load code and paths to game data
-	eapply "${FILESDIR}"/${P}-datafiles.patch
+	"${FILESDIR}"/${P}-datafiles.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
-	eapply "${FILESDIR}"/${P}-gcc6.patch
+src_prepare() {
+	default
 
 	sed -i \
 		-e "/lvl/s:^:/usr/share/${PN}/:" \
 		-e "s:night:/usr/share/${PN}/night:" \
-		levels.dat || die
+		insaneodyssey/levels.dat || die
 	sed -i \
 		-e "s:tiles.dat:/usr/share/${PN}/tiles.dat:" \
 		-e "s:sprites.dat:/usr/share/${PN}/sprites.dat:" \
@@ -44,17 +43,23 @@ src_prepare() {
 		-e "s:IO_T:/usr/share/${PN}/IO_T:" \
 		-e "s:tiles.att:/usr/share/${PN}/tiles.att:" \
 		-e "s:shot:/usr/share/${PN}/shot:" \
-		io.cpp || die
+		insaneodyssey/io.cpp || die
 	sed -i \
 		-e 's:\[32:[100:' \
-		io.h || die
+		insaneodyssey/io.h || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
-	cd ${PN}
-	dobin ${PN}
-	insinto /usr/share/${PN}
+	cd insaneodyssey || die
+
+	dobin insaneodyssey
+
+	insinto /usr/share/insaneodyssey
 	doins *bmp *png *dat *att *lvl *wav *mod *IT
-	newicon west00r.png ${PN}.png
-	make_desktop_entry ${PN} "Insane Odyssey"
+
+	newicon west00r.png insaneodyssey.png
+	make_desktop_entry insaneodyssey "Insane Odyssey"
 }
diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
index 1a68949fdc8e..b6edde2cba52 100644
--- a/games-arcade/lbreakout2/Manifest
+++ b/games-arcade/lbreakout2/Manifest
@@ -1,6 +1,6 @@
-AUX lbreakout2-2.6.5-gentoo.patch 2112 BLAKE2B ede968faa5aee77cf8325a176d5249ae29c87f2e1aaedaddbf9f24c7a763c2e711fd999c914b97f7cd468b4738df832538eb9a7528f01280e42fee6adc1d2587 SHA512 e3f4ce13d67b9c84ef813aa09957ac2615724986821846544839b92f616b66bdf2da1d3239c4a48c8eaf071d0e98fcaf9f2c2cab6a314ea91f5671ef75367b58
+AUX lbreakout2-2.6.5-gentoo.patch 2134 BLAKE2B ba98ce2153009499c8ab1f59674a2e762073b8e0a03a156d77b7a27f981cd1c39bf4dcbce22cc9f1d9c9c30865598b027032385a5efda7f0e0feadade9d9ada1 SHA512 39b28bcf666742d81292f45206d4ba444ee7133f52de31999d6e4a6f2be5791f1ae9da5adfd8b1c9e54c6e8a0ecf0c003851a52f195f1b5a1f0cb53465bddf30
 DIST lbreakout2-2.6.5.tar.gz 3491519 BLAKE2B b382b391f3aa12f975ed52ec9f7de21f864c2171e0b6d1469ae1224b3cb240ff8a680ebae9ea37a85aa95c432c164058e8a9a0a1d094bbef572670bdbd17ca4e SHA512 45c54bc9401131c96eba5fdcc08ca1324904fb50d3967acf7f29034045cbcd4c1d0b65f38eb33d8aace4cfe35f2a2e7a6c2319e4a6d6a1b41274dbe293a1747b
 DIST lbreakout2-levelsets-20141220.tar.gz 372221 BLAKE2B 16da9ee84e856734645a2ddf1665a8ebf8a52aa63be5d91e20f359bfb270d7bed16e7a4903c0847543141120d8d633bf84ceda867000354eedf201e389faf0db SHA512 482c1e95a37735f7bca510fa34d0f046e89b5aa9528b9af9dfff5bcb3fe656140285a95670caae2565cc9ebd30c3dc87a1fe77a6b75061ce9349ee7e36aa13d5
 DIST lbreakout2-themes-20141220.tar.gz 34006503 BLAKE2B 5262e04368d1c77b2690f70ded0c3da17b7ce31175271f22142b0418dfabb840561f4dbd97d16a12da6addb9d15e22e5ca97f96c8380bd0e7983642ee55fd1e3 SHA512 6088ff4bd9dfbbeb91c74e4adb500593af88ea6796bdec577afb43fc4ea9819c4f2dae76b6b7a8ad1ce2ec32ef575e41a6fa924463107a5dcd211f50bb94a906
-EBUILD lbreakout2-2.6.5-r1.ebuild 1995 BLAKE2B 1631577a0beded19accb323268c5bc37a4828d7c82f5fbb9d0fabcb0673dc69212ac9a13b4779e9dbfad09d5a44bc788b9ff766823de65019d508435ce9c6207 SHA512 ad3879d5185d5703ac84c0d4932d8a2076d3add5befc5833bb6b906f3e01d36bd7248269a25aad9c7ec7a5dc7c2b505fc19f517d628e9553f4f27bd4ce8ee7e7
+EBUILD lbreakout2-2.6.5-r1.ebuild 2058 BLAKE2B 4eecffaf1454de018affe6816f49760c329596b086889687e8647108d72131a698141fe114d4878d6d2dfd61ecf40962bf52f818df385cae4f6df66f4661a769 SHA512 c6ba48f3c3f3946dbb6e5e18a88a3ab05a0611ed7b3efa414ad1f1cbd8c6406785fb48d9aa4f7c3ad154298f81d7169af67135d24b3947776ac84dbb1248527f
 MISC metadata.xml 413 BLAKE2B 483149bf4aab9f2a8fea8fbaa6cdcf8ea0c029750acc79b8c4203f27f139a96bf80f5c73c972802ac9eea89f29e98c71214d7a723b82d81290a776fd49480ad7 SHA512 152c0d0d5ac6e3babb26c8eba16c31ed687e0a39ee7b6a86442a1a1efcb4f2d63ccd7f6062857df78047dca8466f548548d40c8baf8359cbaf1758ac03eb1661
diff --git a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
index 365274c581b9..3284426749af 100644
--- a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
+++ b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
@@ -1,34 +1,24 @@
---- lbreakout2-2.6.1.orig/Makefile.am
-+++ lbreakout2-2.6.1/Makefile.am
-@@ -1,13 +1,8 @@
- SUBDIRS = intl m4 po common gui game server client docs
- 
- EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
--README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
--lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
--
--desktopdir = $(datadir)/applications
--desktop_DATA = lbreakout2.desktop
--icondir = $(datadir)/icons
--icon_DATA = lbreakout48.gif
-+README-SDL.txt TODO lbreakout2.spec touchall \
-+win32_mancomp win32_preparchive
- 
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
- TODO lbreakout2.spec ABOUT-NLS
---- lbreakout2-2.6.1.orig/common/gettext.h
-+++ lbreakout2-2.6.1/common/gettext.h
+--- a/common/gettext.h
++++ b/common/gettext.h
 @@ -24,6 +24,7 @@
  
  /* Get declarations of GNU message catalog functions.  */
  # include <libintl.h>
 +# include <locale.h>
  
- #else
+ /* We need locale.h too, otherwise setlocale() bails out; cf. #643471 */
+ #if HAVE_LOCALE_H
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@
+ dnl Checks for programs.
+ AM_GNU_GETTEXT
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_EXEEXT
  
---- lbreakout2-2.6.1.orig/configure.in
-+++ lbreakout2-2.6.1/configure.in
-@@ -80,8 +80,6 @@
+@@ -80,8 +81,6 @@
  [  --enable-netdebug           Enable net packet debugging.], netdebug_flag="-DNET_DEBUG_MSG" )
  AC_SUBST(netdebug_flag)
  
@@ -37,8 +27,8 @@
  locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
  
  dnl installation&highscore path
---- lbreakout2-2.6.1.orig/docs/Makefile.am
-+++ lbreakout2-2.6.1/docs/Makefile.am
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
 @@ -7,11 +7,11 @@
  warp.jpg screen.jpg
  
@@ -54,8 +44,26 @@
  
  win32-install-script:
  	@for file in $(EXTRA_DIST); do \
---- lbreakout2-2.6.1.orig/po/Makefile.in.in
-+++ lbreakout2-2.6.1/po/Makefile.in.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,8 @@
+ SUBDIRS = intl m4 po common gui game server client docs
+ 
+ EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
+-README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
+-lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
+-
+-desktopdir = $(datadir)/applications
+-desktop_DATA = lbreakout2.desktop
+-icondir = $(datadir)/icons
+-icon_DATA = lbreakout48.gif
++README-SDL.txt TODO lbreakout2.spec touchall \
++win32_mancomp win32_preparchive
+ 
+ WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
+ TODO lbreakout2.spec ABOUT-NLS
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
 @@ -24,7 +24,7 @@
  exec_prefix = @exec_prefix@
  datadir = @datadir@
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
index 5be797a596df..129ed748d93f 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop flag-o-matic gnome2-utils
 
 levels_V=20141220
@@ -24,36 +25,38 @@ RDEPEND="
 	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-net
 	media-libs/sdl-mixer
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_unpack() {
 	unpack ${P}.tar.gz
 
-	cd "${S}/client/levels"
+	cd "${S}/client/levels" || die
 	unpack ${PN}-levelsets-${levels_V}.tar.gz
 
-	if use themes ; then
-		mkdir "${WORKDIR}/themes"
-		cd "${WORKDIR}/themes"
+	if use themes; then
+		mkdir "${WORKDIR}"/themes || die
+		cd "${WORKDIR}"/themes || die
 		unpack ${PN}-themes-${themes_V}.tar.gz
 
 		# Delete a few duplicate themes (already shipped with lbreakout2
 		# tarball). Some of them have different case than built-in themes, so it
 		# is harder to just compare if the filename is the same.
-		rm -f absoluteB.zip oz.zip moiree.zip
+		rm -f absoluteB.zip oz.zip moiree.zip || die
+		local f
 		for f in *.zip; do
-			unzip -q "$f"  &&  rm -f "$f" || die
+			unzip -q "${f}" || die
+			rm -f "${f}" || die
 		done
 	fi
 }
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -61,17 +64,16 @@ src_configure() {
 	filter-flags -O?
 	econf \
 		--enable-sdl-net \
-		--localedir=/usr/share/locale \
-		--with-docdir="/usr/share/doc/${PF}/html" \
+		--with-docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		$(use_enable nls)
 }
 
 src_install() {
 	default
 
-	if use themes ; then
+	if use themes; then
 		insinto /usr/share/lbreakout2/gfx
-		doins -r "${WORKDIR}/themes/"*
+		doins -r "${WORKDIR}"/themes/.
 	fi
 
 	newicon client/gfx/win_icon.png ${PN}.png
diff --git a/games-arcade/open-supaplex/Manifest b/games-arcade/open-supaplex/Manifest
new file mode 100644
index 000000000000..6c7303c50599
--- /dev/null
+++ b/games-arcade/open-supaplex/Manifest
@@ -0,0 +1,4 @@
+AUX open-supaplex.svg 1613 BLAKE2B 8f5a6061239d9e573792890d2c2dcff6ba34e113832fc033d53c99af1ab9ffa8139465dc3b37b7dae0861db33d15cffa5da01d7a4ac69e7c66bf9d8b461fc553 SHA512 3a9a1f7fc9b0dd493e995d0dd3786067e53160a7ba0f3506282475cd2eaf6a6dd392bcfe925308845f331c7cdc4f1df872dcb1be7727e89d01ac6942100e8eeb
+DIST open-supaplex-7.1.2.tar.gz 50157943 BLAKE2B 74811edf2dbf65b21fc502703ecadaa293ac5219e0c17b6876a6c6d81c46456d3d06717b56124ce5a675dbfa2c228235479ab8e5baf33fc3618576936dc9b62c SHA512 960c916d9af142511c755babeed24e4cde71bf9b61a5d77b988c45dc9fb9065ca6c65f07b72a2c413a1a7a5158da597f72e9d4d907de9585c4a6cc410e6134f6
+EBUILD open-supaplex-7.1.2.ebuild 1249 BLAKE2B c797ce6eb943a131a8f919ed3ec24a198178c1fc4d25947295b52fda1ea69a996d3759189263275a2c91446b30b421958ea1a1fd971d40d99e92958931f804a7 SHA512 754b0186a1bf6584e3535a5c1434ebc34f2019083a3e88d4c2f2f9e9ef0d2729027f3e5ab2549e2494cfb666778ae9b645951bed57156840bdeca871b29cf844
+MISC metadata.xml 575 BLAKE2B dab25c54577e9b6bf3dcc8cce583ad18fa691b72feaa39e4326b9d9d4e6aecfdfc0663f512b96bbae9de9ba988777305ad20067d3c18e1752c6c10c890571064 SHA512 adb54e7ed6b9d17fb2d5ac4442e8ab2a7fa697632fe5a25519f96c6bd527a60f70a4c2460edf8046edfcf3046f31223c463f27d582ecf8b508d6a1dbc4de79a3
diff --git a/games-arcade/open-supaplex/files/open-supaplex.svg b/games-arcade/open-supaplex/files/open-supaplex.svg
new file mode 100644
index 000000000000..7b91141b63fb
--- /dev/null
+++ b/games-arcade/open-supaplex/files/open-supaplex.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.0" viewBox="0 0 1280 1280" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(-640,-110)">
+<g>
+<path d="m1040 1350v-40h-160v-80h-80v-80h-80v-80h-80v-640h80v-80h80v-80h80v-80h80v-80h640v80h160v80h80v160h80v640h-80v80h-80v80h-80v80h-160v80h-480z"/>
+</g>
+<g fill="#303030">
+<path d="m1040 1350v-40h-160v-80h-80v-80h-80v-80h-80v-640h80v-80h80v-80h80v-80h80v-80h640v80h160v80h80v160h80v640h-80v80h-80v80h-80v80h-160v80h-480zm0-800v-40h-80v80h80zm640 0v-40h-80v80h80z"/>
+</g>
+<g fill="#b00000">
+<path d="m1040 1350v-40h-160v-80h-80v-80h-80v-80h-80v-640h80v-80h80v-80h80v-80h80v-80h640v80h160v80h80v160h80v640h-80v80h-80v80h-80v80h-160v80h-480zm480-320v-40h-400v80h400zm-480-80v-40h-80v80h80zm640 0v-40h-80v80h80zm-800-160v-40h-80v80h80zm960 0v-40h-80v80h80zm-800-240v-40h-80v80h80zm640 0v-40h-80v80h80z"/>
+</g>
+<g fill="#e01010">
+<path d="m1040 1190v-40h-160v-80h-80v-80h-80v-160h-80v-320h80v-160h80v-80h80v-80h160v-80h480v80h160v80h80v80h80v160h80v400h-80v80h-80v80h-80v80h-160v80h-480zm480-80v-40h80v-80h160v-80h80v-160h-80v80h-80v80h-160v80h-400v-80h-160v-80h-80v-80h-80v160h80v80h160v80h80v80h400zm-480-560v-40h-80v80h80zm640 0v-40h-80v80h80z"/>
+</g>
+<g fill="#767676">
+<path d="m880 550v-40h80v-80h80v80h-80v80h-80z"/>
+<path d="m1680 550v-40h-80v-80h80v80h80v80h-80z"/>
+</g>
+<g fill="#f09040">
+<path d="m720 390v-40h80v-80h80v-80h80v80h-80v80h-80v80h-80z"/>
+<path d="m1680 310v-40h-160v-80h160v80h80v80h-80z"/>
+</g>
+<g fill="#f0f0f0">
+<path d="m960 470v-40h80v80h-80z"/>
+<path d="m1600 470v-40h80v80h-80z"/>
+</g>
+</g>
+</svg>
diff --git a/games-arcade/open-supaplex/metadata.xml b/games-arcade/open-supaplex/metadata.xml
new file mode 100644
index 000000000000..f41123363bc8
--- /dev/null
+++ b/games-arcade/open-supaplex/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sergiou87/open-supaplex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-arcade/open-supaplex/open-supaplex-7.1.2.ebuild b/games-arcade/open-supaplex/open-supaplex-7.1.2.ebuild
new file mode 100644
index 000000000000..73f47b1b3109
--- /dev/null
+++ b/games-arcade/open-supaplex/open-supaplex-7.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="OSS reimplementation of Supaplex in C and SDL"
+HOMEPAGE="https://github.com/sergiou87/open-supaplex"
+SRC_URI="https://github.com/sergiou87/open-supaplex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libsdl2[joystick,sound,video]
+	media-libs/sdl2-mixer[vorbis]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-lang/ruby )
+"
+
+src_prepare() {
+	default
+	rm -r resources/audio-{l,m}q || die
+}
+
+src_compile() {
+	append-cflags -DFILE_FHS_XDG_DIRS -DFILE_DATA_PATH="${EPREFIX}/usr/share/OpenSupaplex"
+	emake -C linux CC="$(tc-getCC)"
+}
+
+src_test() {
+	emake -C tests CC="$(tc-getCC)"
+	# Avoid installing savegames, configs, etc, if any were written during the test
+	cp -R resources "${T}/test" || die
+	cd tests || die
+	OPENSUPAPLEX_PATH="${T}/test" ./run-tests.rb ./opensupaplex || die
+}
+
+src_install() {
+	dobin linux/opensupaplex
+	insinto /usr/share/OpenSupaplex
+	doins -r resources/*
+	doicon "${FILESDIR}/open-supaplex.svg"
+	make_desktop_entry opensupaplex OpenSupaplex open-supaplex
+}
diff --git a/games-arcade/opentyrian/Manifest b/games-arcade/opentyrian/Manifest
index 316bef53260d..6785d9ba06fd 100644
--- a/games-arcade/opentyrian/Manifest
+++ b/games-arcade/opentyrian/Manifest
@@ -1,6 +1,7 @@
 AUX 2.1.20130907-cflag-idiocy.diff 583 BLAKE2B 2b0da43af2c1ccb5f508573413d1c047186c8d596bd709aefcdee1fe79936774e1c1c01863bffeed6e1c5506f2897021c5f70988cef59d6c1d7397b8150b5f4e SHA512 fd12ebaabd2191baa248019b122acad205f1803b0abde19ae54d410550529bff93d42dfe26543d295efe3b4c6cd74e1d77681467dc8321832561b07bda92d9c4
 AUX 2.1.20130907-datapath.diff 886 BLAKE2B a388fdbe60a5c1abb4bea213af34854e470b80f2648352e9be0beec88081450e04069da5bfc5b817a720e5fd6a98f5643695b9e5dd9823ce7397da4b0349075b SHA512 dcc5bf8e1c1384e7615112bf60f317f8bd3bae11e1fff1bce80a8a638fc6b719f4787f69d01f64dab2aecab4ef3007cb708e1b2891b6cb7c6213b2d495924d2a
+AUX 2.1.20130907-gcc10.patch 12090 BLAKE2B c15003d42e00d057470b655581ba299ee8e3c2e681a025a4c670479dba6016ef98c5db8def4845fe01acfe5c73d1ae3412b3b90969c5b02c3bfc161a0de99e28 SHA512 89d25a1a01e71f18487a27ca0d6665478d4d037f6008d3fa0d96d583124f03be4d9b7f97eaacd6fa46173b3ccee047dc258b0a247c0464693d4ee278a7636924
 DIST opentyrian-2.1.20130907-src.tar.gz 297517 BLAKE2B 9d6d357cdda59da22ed039be0a5038cf744045dcb30fe0528137a5ac70a4cd512b24eeee3fe233b4ff2a819bf2aa4187e5109d88c72d18db7e1d64e8ad8db5d8 SHA512 1a560f2061496fbbb57b6334ab207b00a6b2e6a4d6164c6df6ad535ae9d0435c32c3db51d3ce2a0a79eb66d72723d112c1993f59b781750f9bd97afb643a0b67
 DIST tyrian21.zip 4754048 BLAKE2B 6bef66fbc34a4d2d865fe7088a6942a29348153d0d10347860952a152b882fd9eef1748fbfa9fd32d030593d2f8c21e1cd227dd6ca540488ba5093b95a95fb33 SHA512 639aa773778386c14ce508feb4729512d00f80182a3bb0fe8bba4ee38bce91da1867ca93f1a7e5e30ff127da077eed275d8dd6ba82042b627b84f1606e2d6bce
-EBUILD opentyrian-2.1.20130907-r1.ebuild 1363 BLAKE2B 39e9fa0213f25e9f76054e2d86909a4c0f3519fc9ca67b2a3e3a8738fdcbf8b744f04ffc8cd8ee46b5e6a241b40f56fa7c29d0beb3c53824a79ab8b1aa522f55 SHA512 8b0eaebaa373ae0e82edbbedd35950e87af3180d9b237339dff3f5b32557b8f9e4b910116a87a1f2900a83b9cb9987be68dd6e44c8bd0e780e68d6835697d9f9
-MISC metadata.xml 464 BLAKE2B a4a91082f78e099c81a2726c4b5511e13a989b490e6e99761d6aa229493d9a2423e8b8d221654462ce863d44519cb96a33072e8e511a1c79191e0eff8a47d9c5 SHA512 98a768457cc15fd1a16e5fd6ab54bfa7a969ca51f8edcfdc93326c8b36b358eec1da67937b15fcee92d436e464b42fc57ead8f1a1c7c1bdcc94435e713cac379
+EBUILD opentyrian-2.1.20130907-r2.ebuild 1293 BLAKE2B 8a840fde51696b720c92da68e9c5f7fc6570f0545fa82920f10695ced01b9787f9fdcb1729fd8fa5eb1162677830ef31b3d8ed6ca118dfaf9a013f9260f261d4 SHA512 bb96aa8b47bde5cedb1c3d4d0fbd92e32c9a81ce265752c97a4affbca8f212780a70399ebaf5914b1a223fe045d9ecbba81eb04363b7c7259e646b1d00b4f73c
+MISC metadata.xml 461 BLAKE2B 3bb476dfa2020f248017a1d14ec69798f2c2496f5d12bd65234dd496c24f56d87467c8145ce43ae0269869cb7fc7b10482bf179fe145faecef5112e88946db30 SHA512 f7409e028251fd4f2be2a26b0845dfda431d3b91acbb7dd49c373f0cef7e6a012e7fccb2b0a894eed46d65f0b564a691c1207081560e309f02e75b85ccd14628
diff --git a/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch b/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch
new file mode 100644
index 000000000000..5b0c911a2ac2
--- /dev/null
+++ b/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch
@@ -0,0 +1,362 @@
+From 962ee8fc46ca51691bde1c8c1022dacbe8a037ed Mon Sep 17 00:00:00 2001
+From: Carl Reinke <carlreinke@users.noreply.github.com>
+Date: Sun, 14 Jun 2020 14:11:00 -0600
+Subject: [PATCH] Move definitions that don't need to be exposed from opl.h to
+ opl.c
+
+---
+ src/opl.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/opl.h | 157 ++----------------------------------------------------
+ 2 files changed, 154 insertions(+), 156 deletions(-)
+
+diff --git a/src/opl.c b/src/opl.c
+index a4071c5..f15474c 100644
+--- a/src/opl.c
++++ b/src/opl.c
+@@ -23,12 +23,161 @@
+  * Copyright (C) 1998-2001 Ken Silverman
+  * Ken Silverman's official web site: "http://www.advsys.net/ken"
+  */
+-
++#include "opl.h"
+ 
+ #include <math.h>
++#include <stdbool.h>
+ #include <stdlib.h> // rand()
+ #include <string.h> // memset()
+-#include "opl.h"
++
++#define fltype double
++
++ /*
++ define attribution that inlines/forces inlining of a function (optional)
++ */
++#define OPL_INLINE inline
++
++
++#undef NUM_CHANNELS
++#if defined(OPLTYPE_IS_OPL3)
++#define NUM_CHANNELS	18
++#else
++#define NUM_CHANNELS	9
++#endif
++
++#define MAXOPERATORS	(NUM_CHANNELS*2)
++
++
++#define FL05	((fltype)0.5)
++#define FL2		((fltype)2.0)
++#define PI		((fltype)3.1415926535897932384626433832795)
++
++
++#define FIXEDPT			0x10000		// fixed-point calculations using 16+16
++#define FIXEDPT_LFO		0x1000000	// fixed-point calculations using 8+24
++
++#define WAVEPREC		1024		// waveform precision (10 bits)
++
++#define INTFREQU		((fltype)(14318180.0 / 288.0))		// clocking of the chip
++
++
++#define OF_TYPE_ATT			0
++#define OF_TYPE_DEC			1
++#define OF_TYPE_REL			2
++#define OF_TYPE_SUS			3
++#define OF_TYPE_SUS_NOKEEP	4
++#define OF_TYPE_OFF			5
++
++#define ARC_CONTROL			0x00
++#define ARC_TVS_KSR_MUL		0x20
++#define ARC_KSL_OUTLEV		0x40
++#define ARC_ATTR_DECR		0x60
++#define ARC_SUSL_RELR		0x80
++#define ARC_FREQ_NUM		0xa0
++#define ARC_KON_BNUM		0xb0
++#define ARC_PERC_MODE		0xbd
++#define ARC_FEEDBACK		0xc0
++#define ARC_WAVE_SEL		0xe0
++
++#define ARC_SECONDSET		0x100	// second operator set for OPL3
++
++
++#define OP_ACT_OFF			0x00
++#define OP_ACT_NORMAL		0x01	// regular channel activated (bitmasked)
++#define OP_ACT_PERC			0x02	// percussion channel activated (bitmasked)
++
++#define BLOCKBUF_SIZE		512
++
++
++ // vibrato constants
++#define VIBTAB_SIZE			8
++#define VIBFAC				70/50000		// no braces, integer mul/div
++
++ // tremolo constants and table
++#define TREMTAB_SIZE		53
++#define TREM_FREQ			((fltype)(3.7))			// tremolo at 3.7hz
++
++
++ /* operator struct definition
++ For OPL2 all 9 channels consist of two operators each, carrier and modulator.
++ Channel x has operators x as modulator and operators (9+x) as carrier.
++ For OPL3 all 18 channels consist either of two operators (2op mode) or four
++ operators (4op mode) which is determined through register4 of the second
++ adlib register set.
++ Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as
++ 4op channels. The two additional operators for a channel y come from the
++ 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op
++ channel.
++ */
++typedef struct operator_struct {
++	Bit32s cval, lastcval;			// current output/last output (used for feedback)
++	Bit32u tcount, wfpos, tinc;		// time (position in waveform) and time increment
++	fltype amp, step_amp;			// and amplification (envelope)
++	fltype vol;						// volume
++	fltype sustain_level;			// sustain level
++	Bit32s mfbi;					// feedback amount
++	fltype a0, a1, a2, a3;			// attack rate function coefficients
++	fltype decaymul, releasemul;	// decay/release rate functions
++	Bit32u op_state;				// current state of operator (attack/decay/sustain/release/off)
++	Bit32u toff;
++	Bit32s freq_high;				// highest three bits of the frequency, used for vibrato calculations
++	Bit16s* cur_wform;				// start of selected waveform
++	Bit32u cur_wmask;				// mask for selected waveform
++	Bit32u act_state;				// activity state (regular, percussion)
++	bool sus_keep;					// keep sustain level when decay finished
++	bool vibrato,tremolo;			// vibrato/tremolo enable bits
++
++									// variables used to provide non-continuous envelopes
++	Bit32u generator_pos;			// for non-standard sample rates we need to determine how many samples have passed
++	Bits cur_env_step;				// current (standardized) sample position
++	Bits env_step_a,env_step_d,env_step_r;	// number of std samples of one step (for attack/decay/release mode)
++	Bit8u step_skip_pos_a;			// position of 8-cyclic step skipping (always 2^x to check against mask)
++	Bits env_step_skip_a;			// bitmask that determines if a step is skipped (respective bit is zero then)
++
++#if defined(OPLTYPE_IS_OPL3)
++	bool is_4op,is_4op_attached;	// base of a 4op channel/part of a 4op channel
++	Bit32s left_pan,right_pan;		// opl3 stereo panning amount
++#endif
++} op_type;
++
++// per-chip variables
++static op_type op[MAXOPERATORS];
++
++static Bits int_samplerate;
++
++static Bit8u status;
++static Bit32u opl_index;
++#if defined(OPLTYPE_IS_OPL3)
++static Bit8u adlibreg[512];	// adlib register set (including second set)
++static Bit8u wave_sel[44];		// waveform selection
++#else
++static Bit8u adlibreg[256];	// adlib register set
++static Bit8u wave_sel[22];		// waveform selection
++#endif
++
++
++						// vibrato/tremolo increment/counter
++static Bit32u vibtab_pos;
++static Bit32u vibtab_add;
++static Bit32u tremtab_pos;
++static Bit32u tremtab_add;
++
++
++// enable an operator
++void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type);
++
++// functions to change parameters of an operator
++void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt);
++
++void change_attackrate(Bitu regbase, op_type* op_pt);
++void change_decayrate(Bitu regbase, op_type* op_pt);
++void change_releaserate(Bitu regbase, op_type* op_pt);
++void change_sustainlevel(Bitu regbase, op_type* op_pt);
++void change_waveform(Bitu regbase, op_type* op_pt);
++void change_keepsustain(Bitu regbase, op_type* op_pt);
++void change_vibrato(Bitu regbase, op_type* op_pt);
++void change_feedback(Bitu chanbase, op_type* op_pt);
++
+ 
+ static Bit32u generator_add;	// should be a chip parameter
+ 
+diff --git a/src/opl.h b/src/opl.h
+index c8e643b..cbb56ad 100644
+--- a/src/opl.h
++++ b/src/opl.h
+@@ -25,11 +25,8 @@
+  * Ken Silverman's official web site: "http://www.advsys.net/ken"
+  */
+ 
+-
+-#define fltype double
+-
+-#include <stdbool.h>
+ #include <stdint.h>
++
+ typedef uintptr_t	Bitu;
+ typedef intptr_t	Bits;
+ typedef uint32_t	Bit32u;
+@@ -39,154 +36,6 @@ typedef int16_t		Bit16s;
+ typedef uint8_t		Bit8u;
+ typedef int8_t		Bit8s;
+ 
+-
+-/*
+-	define attribution that inlines/forces inlining of a function (optional)
+-*/
+-#define OPL_INLINE inline
+-
+-
+-#undef NUM_CHANNELS
+-#if defined(OPLTYPE_IS_OPL3)
+-#define NUM_CHANNELS	18
+-#else
+-#define NUM_CHANNELS	9
+-#endif
+-
+-#define MAXOPERATORS	(NUM_CHANNELS*2)
+-
+-
+-#define FL05	((fltype)0.5)
+-#define FL2		((fltype)2.0)
+-#define PI		((fltype)3.1415926535897932384626433832795)
+-
+-
+-#define FIXEDPT			0x10000		// fixed-point calculations using 16+16
+-#define FIXEDPT_LFO		0x1000000	// fixed-point calculations using 8+24
+-
+-#define WAVEPREC		1024		// waveform precision (10 bits)
+-
+-#define INTFREQU		((fltype)(14318180.0 / 288.0))		// clocking of the chip
+-
+-
+-#define OF_TYPE_ATT			0
+-#define OF_TYPE_DEC			1
+-#define OF_TYPE_REL			2
+-#define OF_TYPE_SUS			3
+-#define OF_TYPE_SUS_NOKEEP	4
+-#define OF_TYPE_OFF			5
+-
+-#define ARC_CONTROL			0x00
+-#define ARC_TVS_KSR_MUL		0x20
+-#define ARC_KSL_OUTLEV		0x40
+-#define ARC_ATTR_DECR		0x60
+-#define ARC_SUSL_RELR		0x80
+-#define ARC_FREQ_NUM		0xa0
+-#define ARC_KON_BNUM		0xb0
+-#define ARC_PERC_MODE		0xbd
+-#define ARC_FEEDBACK		0xc0
+-#define ARC_WAVE_SEL		0xe0
+-
+-#define ARC_SECONDSET		0x100	// second operator set for OPL3
+-
+-
+-#define OP_ACT_OFF			0x00
+-#define OP_ACT_NORMAL		0x01	// regular channel activated (bitmasked)
+-#define OP_ACT_PERC			0x02	// percussion channel activated (bitmasked)
+-
+-#define BLOCKBUF_SIZE		512
+-
+-
+-// vibrato constants
+-#define VIBTAB_SIZE			8
+-#define VIBFAC				70/50000		// no braces, integer mul/div
+-
+-// tremolo constants and table
+-#define TREMTAB_SIZE		53
+-#define TREM_FREQ			((fltype)(3.7))			// tremolo at 3.7hz
+-
+-
+-/* operator struct definition
+-     For OPL2 all 9 channels consist of two operators each, carrier and modulator.
+-     Channel x has operators x as modulator and operators (9+x) as carrier.
+-     For OPL3 all 18 channels consist either of two operators (2op mode) or four
+-     operators (4op mode) which is determined through register4 of the second
+-     adlib register set.
+-     Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as
+-     4op channels. The two additional operators for a channel y come from the
+-     2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op
+-     channel.
+-*/
+-typedef struct operator_struct {
+-	Bit32s cval, lastcval;			// current output/last output (used for feedback)
+-	Bit32u tcount, wfpos, tinc;		// time (position in waveform) and time increment
+-	fltype amp, step_amp;			// and amplification (envelope)
+-	fltype vol;						// volume
+-	fltype sustain_level;			// sustain level
+-	Bit32s mfbi;					// feedback amount
+-	fltype a0, a1, a2, a3;			// attack rate function coefficients
+-	fltype decaymul, releasemul;	// decay/release rate functions
+-	Bit32u op_state;				// current state of operator (attack/decay/sustain/release/off)
+-	Bit32u toff;
+-	Bit32s freq_high;				// highest three bits of the frequency, used for vibrato calculations
+-	Bit16s* cur_wform;				// start of selected waveform
+-	Bit32u cur_wmask;				// mask for selected waveform
+-	Bit32u act_state;				// activity state (regular, percussion)
+-	bool sus_keep;					// keep sustain level when decay finished
+-	bool vibrato,tremolo;			// vibrato/tremolo enable bits
+-	
+-	// variables used to provide non-continuous envelopes
+-	Bit32u generator_pos;			// for non-standard sample rates we need to determine how many samples have passed
+-	Bits cur_env_step;				// current (standardized) sample position
+-	Bits env_step_a,env_step_d,env_step_r;	// number of std samples of one step (for attack/decay/release mode)
+-	Bit8u step_skip_pos_a;			// position of 8-cyclic step skipping (always 2^x to check against mask)
+-	Bits env_step_skip_a;			// bitmask that determines if a step is skipped (respective bit is zero then)
+-
+-#if defined(OPLTYPE_IS_OPL3)
+-	bool is_4op,is_4op_attached;	// base of a 4op channel/part of a 4op channel
+-	Bit32s left_pan,right_pan;		// opl3 stereo panning amount
+-#endif
+-} op_type;
+-
+-// per-chip variables
+-Bitu chip_num;
+-op_type op[MAXOPERATORS];
+-
+-Bits int_samplerate;
+-	
+-Bit8u status;
+-Bit32u opl_index;
+-#if defined(OPLTYPE_IS_OPL3)
+-Bit8u adlibreg[512];	// adlib register set (including second set)
+-Bit8u wave_sel[44];		// waveform selection
+-#else
+-Bit8u adlibreg[256];	// adlib register set
+-Bit8u wave_sel[22];		// waveform selection
+-#endif
+-
+-
+-// vibrato/tremolo increment/counter
+-Bit32u vibtab_pos;
+-Bit32u vibtab_add;
+-Bit32u tremtab_pos;
+-Bit32u tremtab_add;
+-
+-
+-// enable an operator
+-void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type);
+-
+-// functions to change parameters of an operator
+-void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt);
+-
+-void change_attackrate(Bitu regbase, op_type* op_pt);
+-void change_decayrate(Bitu regbase, op_type* op_pt);
+-void change_releaserate(Bitu regbase, op_type* op_pt);
+-void change_sustainlevel(Bitu regbase, op_type* op_pt);
+-void change_waveform(Bitu regbase, op_type* op_pt);
+-void change_keepsustain(Bitu regbase, op_type* op_pt);
+-void change_vibrato(Bitu regbase, op_type* op_pt);
+-void change_feedback(Bitu chanbase, op_type* op_pt);
+-
+ // general functions
+ void adlib_init(Bit32u samplerate);
+ void adlib_write(Bitu idx, Bit8u val);
+@@ -195,8 +44,8 @@ void adlib_getsample(Bit16s* sndptr, Bits numsamples);
+ Bitu adlib_reg_read(Bitu port);
+ void adlib_write_index(Bitu port, Bit8u val);
+ 
+-#endif /* OPL_H */
+-
+ #define opl_init() adlib_init(OUTPUT_QUALITY * 11025)
+ #define opl_write(reg, val) adlib_write(reg, val)
+ #define opl_update(buf, num) adlib_getsample(buf, num)
++
++#endif /* OPL_H */
diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml
index 161bc1494dc2..33834cfebd8d 100644
--- a/games-arcade/opentyrian/metadata.xml
+++ b/games-arcade/opentyrian/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Games Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="bitbucket">opentyrian/opentyrian</remote-id>
+    <remote-id type="github">opentyrian/opentyrian</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild
deleted file mode 100644
index d6898a9647ff..000000000000
--- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils
-
-DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter"
-HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
-SRC_URI="http://darklomax.org/tyrian/tyrian21.zip
-	 http://www.camanis.net/${PN}/releases/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-net"
-
-# Yes, mercurial is needed to set the build version stamp.
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-vcs/mercurial"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-datapath.diff"
-	"${FILESDIR}/${PV}-cflag-idiocy.diff"
-)
-
-src_compile() {
-	emake DATA_PATH="/usr/share/${PN}"
-}
-
-src_install() {
-	dobin opentyrian
-	dosym ../../usr/bin/opentyrian /usr/bin/tyrian
-	dodoc CREDITS NEWS README
-	domenu linux/opentyrian.desktop || die "Failed to install desktop file"
-	for i in linux/icons/*.png ; do
-		local size=`echo ${i} | sed -e 's:.*-\([0-9]\+\).png:\1:'`
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins ${i} opentyrian.png
-	done
-	insinto "/usr/share/${PN}"
-	cd "${WORKDIR}/tyrian21"
-	rm *.exe dpmi16bi.ovl loudness.awe || die "Failed to remove win32 binaries"
-	doins *
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild
new file mode 100644
index 000000000000..74fce946ff85
--- /dev/null
+++ b/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter"
+HOMEPAGE="https://github.com/opentyrian/opentyrian"
+SRC_URI="http://darklomax.org/tyrian/tyrian21.zip
+	http://www.camanis.net/${PN}/releases/${P}-src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-net"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-datapath.diff"
+	"${FILESDIR}/${PV}-cflag-idiocy.diff"
+	"${FILESDIR}/${PV}-gcc10.patch"
+)
+
+src_prepare() {
+	default
+	rm "${WORKDIR}"/tyrian21/{*.exe,dpmi16bi.ovl,loudness.awe} || die "Failed to remove win32 binaries"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		DATA_PATH="${EPREFIX}/usr/share/${PN}"
+}
+
+src_install() {
+	dobin opentyrian
+	dosym opentyrian /usr/bin/tyrian
+	dodoc CREDITS NEWS README
+	domenu linux/opentyrian.desktop
+
+	local size
+	for i in linux/icons/*.png ; do
+		size=${i%.png}
+		size=${size##*-}
+		newicon -s "${size}" "${i}" opentyrian.png
+	done
+
+	insinto /usr/share/"${PN}"
+	doins "${WORKDIR}"/tyrian21/*
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
index c73f655b900b..c52db6dc2cf7 100644
--- a/games-arcade/tuxpuck/Manifest
+++ b/games-arcade/tuxpuck/Manifest
@@ -1,7 +1,5 @@
-AUX tuxpuck-0.8.2-freetype_pkgconfig.patch 377 BLAKE2B 73f974e8e93cb425e72745fa00a1943a30830dae4bfdee5eef75adc240ebf9885b4dd30f1bfb6291fb873a35a0f63595a11b0399e3b028263065b59a9193542b SHA512 b41eb1a0e64aac8a01ceeab8be43bdaa8da394f6e2fa09222eb78baec0d4b9f622340434111237f37afc8b58ea1d887a012c777afddae75a9394a4519b3925f4
-AUX tuxpuck-0.8.2-ldflags.patch 411 BLAKE2B 0b0a20abe1daf4f02e07f23f8cc0273b5b7cf229ea3b9de3cb13ea4611ba5b6b932ebf9286ebcdb19605de672b66300530a6fb3ca776bdfd1a05a377976d7746 SHA512 50e91cfb89be78e7fbf45c361d9bd2bc2ef84770d868978dbc200bb9954b51789478e611f8e1197e418775624ce57c62424a6a456cd62ffe45ccb93aaa58a88a
-AUX tuxpuck-0.8.2-parallel.patch 1705 BLAKE2B a9402f63386287c1d77f58d6998869c5e946016fda93932f851de73e3edae4b3ec3e08fea68f86c98e5e490d5a168c1bb809332d379470c00db0527fd462e972 SHA512 e489e76fe86f62962017615015f9bca7f15e3b001265d7212ae99a27e833152ab6b1a4caacffc32c4143a47e06ee4d010114d70f57548c7d91ccc8e61667b5e0
+AUX tuxpuck-0.8.2-Makefile.patch 4200 BLAKE2B 463243836f41043593ccd2f70ff3b54f82ae84a9048a26e42f0d46e7170835b9a080e80c58389bed479b48e3f266ddf09170f63dc6a84ac33b0611d991ede189 SHA512 a6133f57c97bcabc858b4466d9b13081d31e0a5c84ea59ad95301ab9f76fd32e894f2ccaa699ad6aaccf57f424e832594ed0e19d560d9905e6e304aff65bcb4e
 AUX tuxpuck-0.8.2-png15.patch 2128 BLAKE2B b9ebbeff8974dbfd0693dea225e9e73c044aaf5c0d8159458c2c8439fb3d1985c223c71a9e69d47d1c648abcf2784ed7a7d6f9a59a880d2e5b485d3498f0172e SHA512 d6d05b8e10736010a80af565d9dd6cc3aa076070796f348d86c0af8a7d008e1fbb9cffd4422d2193bbe880c0a2637f424879c6e9ce84427f01badbd2129c3b4a
 DIST tuxpuck-0.8.2.tar.gz 384009 BLAKE2B e60241c5e6825ae6570a0d3242178578ef1202d3fbb4276726fdfddb894883fe5e25218bb29f6fd8148d273ab91dd36f0624c814756d8375cea5b88f090fcde7 SHA512 875680f7fd9d4257884c58d8a5529082aac4dc10f1a9c9d08acd4e67ddb5e9c66dd84a4fbcc27e3673e329d845b0966ea683412ffe61f0a403d195eac0f32a46
-EBUILD tuxpuck-0.8.2-r2.ebuild 1176 BLAKE2B c37c434505009ae4af0dd32fbee53b190837463882203d88460d9fac4a7fe3089a193e860fe49e31b9016f8b6acfbd8e07f195acf66717d19412231d90d2c6f8 SHA512 985b7b907fe20e0806b458df3e381ce13068e6fa682bc9764515fdac7ca85ae2e15b98293caf49cf758ab87dd5b299e51298d17e0a34c7de5475d05891583e08
+EBUILD tuxpuck-0.8.2-r2.ebuild 1033 BLAKE2B a641f7c3bc542f1e1a8b221b4d7c314b47f9df9db7d6c7f7bf2c0ae12b40e8c405ab260d2f871f5825c5d54c2fb955d26e5984ad870a7523fb4b46a472bf3829 SHA512 8bafda0a19fb85dfc65a380205ca3f0b9621d09ce8c8ae7dfe73bc7a42db5e995d9b5482a7e0659e8d2c3cd5b750e8d11fb777827914dbe164ec7681c53fabc7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch
new file mode 100644
index 000000000000..30b97283a2e2
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch
@@ -0,0 +1,139 @@
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -1,5 +1,4 @@
+ # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
+-CC		= gcc
+ SOURCES		= pad_png.c puck_png.c tux_png.c glass_png.c scoreboard_png.c \
+ 		  arcana_png.c mousebar_png.c title_jpg.c board_jpg.c \
+ 		  logo_jpg.c crash_ogg.c nock_ogg.c tux_apps_ogg.c \
+@@ -9,27 +8,33 @@
+ 
+ OBJS=$(SOURCES:.c=.o)
+ 
+-%.o	: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
+-
+ libdata.a : $(OBJS)
+-	ar r libdata.a $(OBJS)
+-	ranlib libdata.a
++	$(AR) r libdata.a $(OBJS)
++	$(RANLIB) libdata.a
+ 
+-$(SOURCES):
+-	cd ../utils/; $(MAKE)
++monos_fnt.c:
+ 	../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
+ 	../utils/data2c monos.fnt monos_fnt
++	rm monos.fnt
++monob_fnt.c:
+ 	../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
+ 	../utils/data2c monob.fnt monob_fnt
+-	rm *.fnt
++	rm monob.fnt
++title_jpg.c:
+ 	../utils/data2c jpgs/title.jpg title_jpg
++board_jpg.c:
+ 	../utils/data2c jpgs/board.jpg board_jpg
++logo_jpg.c:
+ 	../utils/data2c jpgs/logo.jpg logo_jpg
++pad_png.c: pngs/pad.png
+ 	../utils/data2c pngs/pad.png pad_png
++puck_png.c: pngs/puck.png
+ 	../utils/data2c pngs/puck.png puck_png
++scoreboard_png.c:
+ 	../utils/data2c pngs/scoreboard.png scoreboard_png
++mousebar_png.c:
+ 	../utils/data2c pngs/mousebar.png mousebar_png
++glass_png.c:
+ 	../utils/data2c pngs/glass.png glass_png
+ 	../utils/data2c pngs/piece1.png piece1_png
+ 	../utils/data2c pngs/piece2.png piece2_png
+@@ -38,15 +43,22 @@
+ 	../utils/data2c pngs/piece5.png piece5_png
+ 	mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
+ 	rm piece?_png.c temp
++crash_ogg.c:
+ 	../utils/data2c sounds/crash.ogg crash_ogg
++nock_ogg.c:
+ 	../utils/data2c sounds/nock.ogg nock_ogg
++tux_eyes_spr.c:
+ 	# Tux
+ 	../utils/anim tux/eyes.ac tux_eyes.spr
+ 	../utils/data2c tux_eyes.spr tux_eyes_spr
+ 	rm tux_eyes.spr
++tux_png.c: tux/tux.png
+ 	../utils/data2c tux/tux.png tux_png
++tux_apps_ogg.c:
+ 	../utils/data2c tux/apps.ogg tux_apps_ogg
++tux_boos_ogg.c:
+ 	../utils/data2c tux/boos.ogg tux_boos_ogg
++arcana_png.c:
+ 	# Arcana
+ 	../utils/data2c arcana/arcana.png arcana_png
+ clean :
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,14 @@
+ # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
+ NAME		= tuxpuck
+ VERSION		= 0.8.2
+-CC		= gcc
+-CFLAGS		+= -D_VERSION=\"$(VERSION)\" -g -Wall
++CPPFLAGS	+= -D_VERSION=\"$(VERSION)\"
++CFLAGS		+= -Wall
+ CSOURCES	= tuxpuck.c video.c audio.c menu.c sprite.c font.c timer.c \
+ 		  board.c entity.c glass.c scoreboard.c player.c zoom.c png.c \
+ 		  jpg.c intro.c tux.c arcana.c 
+ INCLUDES	= tuxpuck.h video.h audio.h font.h
+-	   	  
++SDL_CFLAGS = $(shell $$PKG_CONFIG --cflags sdl)
++SDL_LIBS = $(shell $$PKG_CONFIG --libs sdl)
+ 
+ #############################################################
+ 
+@@ -17,11 +18,11 @@
+ endif
+ 
+ %.o	: %.c
+-	$(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
+ 
+ $(NAME) : $(OBJS)
+-	cd data; $(MAKE)
+-	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++	cd data && $(MAKE)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a $(SDL_LIBS) -lm -lpng \
+ 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
+ 
+ w32icon.o : data/icons/tuxpuck.ico
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -1,18 +1,23 @@
+ # Makefile for TuxPuck Utils , Copyright Jacob Kroon 2001-2002
+-CC		= gcc
+-CFLAGS		+= -g -Wall -Werror
++CFLAGS		+= -Wall
++
++FREETYPE_CFLAGS = $(shell $$PKG_CONFIG --cflags freetype2)
++FREETYPE_LIBS = $(shell $$PKG_CONFIG --libs freetype2)
++
++SDL_CFLAGS = $(shell $$PKG_CONFIG --cflags sdl)
++SDL_LIBS = $(shell $$PKG_CONFIG --libs sdl)
+ #############################################################
+ 
+ all : ttf2font data2c anim
+ 
+ ttf2font : ttf2font.c
+-	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ttf2font.c -o ttf2font $(FREETYPE_CFLAGS) $(FREETYPE_LIBS)
+ 
+ data2c : data2c.c
+-	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) data2c.c -o data2c $(SDL_CFLAGS) $(SDL_LIBS)
+ 
+ anim : anim.c
+-	$(CC) $(CFLAGS) anim.c `sdl-config --cflags --libs` -o anim
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) anim.c -o anim $(SDL_CFLAGS) $(SDL_LIBS)
+ 
+ clean :
+ 	rm -f *~ data2c ttf2font anim
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
deleted file mode 100644
index 410024e48dcd..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuxpuck-0.8.2/utils/Makefile
-+++ tuxpuck-0.8.2/utils/Makefile
-@@ -6,7 +6,7 @@
- all : ttf2font data2c anim
- 
- ttf2font : ttf2font.c
--	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
-+	$(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
- 
- data2c : data2c.c
- 	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index b4abb60f0fd4..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2010-10-05 10:34:57.000000000 +0200
-+++ b/Makefile	2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- $(NAME) : $(OBJS)
- 	cd data; $(MAKE)
--	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
- 
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
deleted file mode 100644
index 7d9b199f55cf..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/data/Makefile.old	2015-01-07 14:22:34.852150894 +0100
-+++ b/data/Makefile	2015-01-07 14:57:44.079822614 +0100
-@@ -15,20 +15,29 @@
- 	ar r libdata.a $(OBJS)
- 	ranlib libdata.a
- 
--$(SOURCES):
--	cd ../utils/; $(MAKE)
-+monos_fnt.c:
- 	../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
- 	../utils/data2c monos.fnt monos_fnt
-+	rm monos.fnt
-+monob_fnt.c:
- 	../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
- 	../utils/data2c monob.fnt monob_fnt
--	rm *.fnt
-+	rm monob.fnt
-+title_jpg.c:
- 	../utils/data2c jpgs/title.jpg title_jpg
-+board_jpg.c:
- 	../utils/data2c jpgs/board.jpg board_jpg
-+logo_jpg.c:
- 	../utils/data2c jpgs/logo.jpg logo_jpg
-+pad_png.c: pngs/pad.png
- 	../utils/data2c pngs/pad.png pad_png
-+puck_png.c: pngs/puck.png
- 	../utils/data2c pngs/puck.png puck_png
-+scoreboard_png.c:
- 	../utils/data2c pngs/scoreboard.png scoreboard_png
-+mousebar_png.c:
- 	../utils/data2c pngs/mousebar.png mousebar_png
-+glass_png.c:
- 	../utils/data2c pngs/glass.png glass_png
- 	../utils/data2c pngs/piece1.png piece1_png
- 	../utils/data2c pngs/piece2.png piece2_png
-@@ -37,15 +46,22 @@
- 	../utils/data2c pngs/piece5.png piece5_png
- 	mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
- 	rm piece?_png.c temp
-+crash_ogg.c:
- 	../utils/data2c sounds/crash.ogg crash_ogg
-+nock_ogg.c:
- 	../utils/data2c sounds/nock.ogg nock_ogg
-+tux_eyes_spr.c:
- 	# Tux
- 	../utils/anim tux/eyes.ac tux_eyes.spr
- 	../utils/data2c tux_eyes.spr tux_eyes_spr
- 	rm tux_eyes.spr
-+tux_png.c: tux/tux.png
- 	../utils/data2c tux/tux.png tux_png
-+tux_apps_ogg.c:
- 	../utils/data2c tux/apps.ogg tux_apps_ogg
-+tux_boos_ogg.c:
- 	../utils/data2c tux/boos.ogg tux_boos_ogg
-+arcana_png.c:
- 	# Arcana
- 	../utils/data2c arcana/arcana.png arcana_png
- clean :
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
index d853da6c5d16..d2fdb0c45bcc 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-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="Hover hockey"
 HOMEPAGE="http://home.no.net/munsuun/tuxpuck/"
@@ -11,38 +12,32 @@ SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl
 	media-libs/libpng:0=
-	virtual/jpeg:0
 	media-libs/libvorbis
-"
+	virtual/jpeg:0"
 DEPEND="${RDEPEND}
-	media-libs/freetype:2
-	virtual/pkgconfig
-"
+	media-libs/freetype:2"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-png15.patch
+)
 
 src_prepare() {
 	default
+
 	# Bug #376741 - Make unpack call compatible with both
 	# PMS and <sys-apps/portage-2.1.10.10.
 	cd man || die
 	unpack ./${PN}.6.gz
-	cd .. || die
-	sed -i \
-		-e 's/-Werror//' \
-		-e '/^CC/d' \
-		Makefile \
-		utils/Makefile \
-		data/Makefile \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG RANLIB
 }
 
 src_compile() {
@@ -53,9 +48,12 @@ src_compile() {
 
 src_install() {
 	dobin tuxpuck
-	doman man/tuxpuck.6
+
 	dodoc *.txt
+	einstalldocs
+
+	doman man/tuxpuck.6
+
 	doicon data/icons/${PN}.ico
 	make_desktop_entry ${PN} "TuxPuck" /usr/share/pixmaps/${PN}.ico
-	einstalldocs
 }
diff --git a/games-arcade/xtux/Manifest b/games-arcade/xtux/Manifest
index d43713bb9226..ce5b9a87831c 100644
--- a/games-arcade/xtux/Manifest
+++ b/games-arcade/xtux/Manifest
@@ -1,5 +1,7 @@
-AUX xtux-20030306-ldflags.patch 805 BLAKE2B 1d3cda6f7bfb2619507caad5fb5fb769dbfe89fd7e377c9e747e0ec4a515f03079d9c4d34c9ac204f21d504812662676322c643feae68f80ddb9eded0c10668b SHA512 089d03e2ef4072b0d134940771820f151e4e51d95c8f01230a78933e0160fa204dd277b4b0bbd7a4288dbb6fabf1ebe7a976f0ead2096b8eaa21daf82f6c97eb
+AUX xtux-20030306-Makefile.patch 4842 BLAKE2B 19245914aa0716e5fe2c6f106f069d5a1c96ef38c5fb19edd53b03704c2ed9d407341ecb03438f694bdba10b971df0fae66e9369707c2e3c912e7077614cde3d SHA512 f4ba92ececd31a75fcfc80d958493f56f7b822bef5e8ecf2b1269087a8d7b46f836068dc034a6af66ff3ed4b17980e5413d9fff07e02e24b4bb05abf14554d4c
+AUX xtux-20030306-missing-include.patch 585 BLAKE2B 38dffdde1593454d241736572bb37ef6cefbb714aa0006daa1c236df2d68c6daf7f80c42357ec4fac45d3804c53a6af29bba175bea89413eb8516abc53a73b8d SHA512 eeca0a0d7e337a8ed103343e4a25bfdc64614b1ebc06899a8d8b3e2aa467c508ddd6c7c8bab546f7079d6417705dbc2e8516bb85340ed7dd36e02ad5a4994a26
 AUX xtux-20030306-particles.patch 1411 BLAKE2B 22db279e8bdca02029be6a115dc0329893dc69ffd39fcbf773fead770db1cac85c52086bf9bf7e5b23774981f94c86b6858653673f797f082aa3b205bf165443 SHA512 4288325e2e24cbbc2b0407c526d733b028d670d4ce182957392d16675b666c2a9ef44c23227f3acae526bcb439df1e73f13772612ee2c25ac5f373c7863927fd
+AUX xtux-20030306-tux_serv-path.patch 307 BLAKE2B 64f7b9f7156abe6e642eb5205ff75c07e8f69c267139d0523b5b77be13adaa379077bf87f9253ba9df60977aaf5c7d5f8e0283550307b6b1a8dc6e713ccf75a6 SHA512 cf86b26ab078a72591735bbc291449c17ab845149100e0f99480ca7fdef0913eb2be840de8f73e0a9aac3206c6040989cb69184ad8d47973770e2976070814ca
 DIST xtux-src-20030306.tar.gz 1640928 BLAKE2B 0db135f741a978a943035df5b78773bbb3fbbeecc2fd740525614e4f942e7e23b67a6fa5640fa82c2c32d2aa2abe73badc9d341ab0ec06922513a8ed0783ce7a SHA512 edb137b4d6b0fe7d673e8eedffbd9c521800a8e51aff0a36e5aa02d46a157d42142326b334b9c7358cfb5debf4b78a2a9951f82121dd538cfe288cf292a269d4
-EBUILD xtux-20030306-r1.ebuild 1237 BLAKE2B e16eb5e050ddfc154876f12ac5bfb353b85340eaeaa70da1d02a495ddfd4a4ff9a35438ca7c0380b8331f9dcfe752c3752e4934d5e2d194846783c295a0c173c SHA512 c13276f39c98a9c51542716164e4ebe271fb8081cae232cd935f96f5925fcdb094444196b985428bc7fe9ebb86de6ce62b28f787c144d134b4d0453620578ba3
+EBUILD xtux-20030306-r1.ebuild 1169 BLAKE2B b074627a344e7a56dc987c39e59040d860502b89f024b11845d006f3ed1fe2dd2c137253ee0b468fd4c5d2e33f9a70230fcff3c427cd604e050980f5a4403e1f SHA512 1c5c342a2254a32cd680b78277af217c8e150e83a661c0d5fcdc700506c6f4f2de4891fc9457e916909d8332be542a664405f382f30fc264af5fb71e83539b31
 MISC metadata.xml 327 BLAKE2B c3a5163b1311672e516ad8cec744bc8813705ef58da277f566101f8699cf1db7bd519bf80d35b5410ee32185ba3a38ae3f4a04dacd49ed5cfda24dfa45ddea19 SHA512 cda1520a7e746d0b8e78cfe62b83466123b01bc02186b63d365f170bce8477be0f408a73d1436b916538c7c1906a77e73114f8d81fb799d48e7bdb4b0fd5c418
diff --git a/games-arcade/xtux/files/xtux-20030306-Makefile.patch b/games-arcade/xtux/files/xtux-20030306-Makefile.patch
new file mode 100644
index 000000000000..7340dbfd187a
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-Makefile.patch
@@ -0,0 +1,190 @@
+--- a/src/client/Makefile
++++ b/src/client/Makefile
+@@ -16,13 +16,12 @@
+ 
+ # Programs used in building process
+ MAKE = make
+-CC = gcc
+ 
+ # Where to put the XTux client binary.
+ BINARY = $(TOPLEVEL_PATH)/xtux
+ 
+ # Flags used when compiling
+-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
++CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
+ 
+ # Paths to header files
+ X11_INC = -I$(X11_PATH)/include
+@@ -48,8 +47,8 @@
+ 
+ #Apps
+ client: $(OBJECTS)
+-	$(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
++	$(CC) $(LDFLAGS) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
+ 
+ # OBJECTS
+ .c.o:	client.h $*.c
+-	$(CC) $(CFLAGS) -c $*.c $(COMMON_INC) $(X11_INC) $(GGZ_INC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c $(COMMON_INC) $(X11_INC) $(GGZ_INC)
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -1,9 +1,6 @@
+ # Makefile for stuff that's common between server & client.
+ 
+-CC	= gcc
+-CFLAGS	= -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
+-AR	= ar
+-RANLIB	= ranlib
++CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
+ 
+ OBJECTS	= common.o timing.o net.o entity_type.o weapon_type.o map.o maths.o datafile.o
+ XTUXLIB = xtuxlib.a
+@@ -18,4 +15,4 @@
+ 	${RANLIB} $@
+ 
+ .c.o:	xtux.h $*.c $*.h
+-	$(CC) $(CFLAGS) -c $*.c $(COMMON_INC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c $(COMMON_INC)
+--- a/src/ggz/client/Makefile
++++ b/src/ggz/client/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ noinst_LIBRARIES = libggz.a
+@@ -92,13 +90,9 @@
+ 
+ 
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+-CPPFLAGS = 
+-LDFLAGS = 
+ LIBS = 
+ libggz_a_LIBADD = 
+ libggz_a_OBJECTS =  ggz.o
+-AR = ar
+-CFLAGS = -g -O2
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+--- a/src/ggz/easysock/Makefile
++++ b/src/ggz/easysock/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ noinst_LIBRARIES = libeasysock.a
+@@ -92,13 +90,9 @@
+ 
+ 
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+-CPPFLAGS = 
+-LDFLAGS = 
+ LIBS = 
+ libeasysock_a_LIBADD = 
+ libeasysock_a_OBJECTS =  easysock.o
+-AR = ar
+-CFLAGS = -g -O2
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+--- a/src/ggz/Makefile
++++ b/src/ggz/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ SUBDIRS = easysock server client
+--- a/src/ggz/server/Makefile
++++ b/src/ggz/server/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ INCLUDES = -I$(top_srcdir)/easysock
+@@ -94,13 +92,9 @@
+ 
+ 
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+-CPPFLAGS = 
+-LDFLAGS = 
+ LIBS = 
+ libggzd_a_LIBADD = 
+ libggzd_a_OBJECTS =  ggz.o
+-AR = ar
+-CFLAGS = -g -O2
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+--- a/src/server/Makefile
++++ b/src/server/Makefile
+@@ -11,14 +11,11 @@
+ COMMON_PATH = $(TOPLEVEL_PATH)/src/common
+ GGZ_PATH= $(TOPLEVEL_PATH)/src/ggz
+ 
+-# Programs used in building process
+-CC = gcc
+-
+ # Where to put the XTux client binary.
+ BINARY = $(TOPLEVEL_PATH)/tux_serv
+ 
+ # Flags used when compiling
+-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
++CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
+ 
+ # Paths to header files
+ COMMON_INC = -I$(COMMON_PATH)
+@@ -41,8 +38,8 @@
+ 
+ #Apps
+ server:	$(OBJECTS)
+-	$(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
++	$(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
+ 
+ # OBJECTS
+ .c.o:	server.h $*.h $*.c
+-	$(CC) $(CFLAGS) -c $*.c $(COMMON_INC) $(GGZ_INC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c $(COMMON_INC) $(GGZ_INC)
diff --git a/games-arcade/xtux/files/xtux-20030306-ldflags.patch b/games-arcade/xtux/files/xtux-20030306-ldflags.patch
deleted file mode 100644
index 4a4877a6d65a..000000000000
--- a/games-arcade/xtux/files/xtux-20030306-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/client/Makefile.old	2010-09-30 18:08:16.000000000 +0200
-+++ b/src/client/Makefile	2010-09-30 18:08:41.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- #Apps
- client: $(OBJECTS)
--	$(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
-+	$(CC) -o $(BINARY) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
- 
- # OBJECTS
- .c.o:	client.h $*.c
---- a/src/server/Makefile.old	2010-09-30 18:09:55.000000000 +0200
-+++ b/src/server/Makefile	2010-09-30 18:10:16.000000000 +0200
-@@ -41,7 +41,7 @@
- 
- #Apps
- server:	$(OBJECTS)
--	$(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
-+	$(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
- 
- # OBJECTS
- .c.o:	server.h $*.h $*.c
diff --git a/games-arcade/xtux/files/xtux-20030306-missing-include.patch b/games-arcade/xtux/files/xtux-20030306-missing-include.patch
new file mode 100644
index 000000000000..f7a655eecadb
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-missing-include.patch
@@ -0,0 +1,29 @@
+--- a/src/client/cl_net.c
++++ b/src/client/cl_net.c
+@@ -4,7 +4,7 @@
+  */
+ 
+ #include <unistd.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <fcntl.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+--- a/src/client/misc.c
++++ b/src/client/misc.c
+@@ -1,4 +1,5 @@
+ #include <X11/Xlib.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/ggz/client/ggz.c
++++ b/src/ggz/client/ggz.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ static char *name=NULL;
+ static int ggz_sock;
diff --git a/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch b/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch
new file mode 100644
index 000000000000..87e6043f2178
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch
@@ -0,0 +1,13 @@
+--- a/src/client/menu.c
++++ b/src/client/menu.c
+@@ -726,8 +726,8 @@
+ 	for( i=0 ; i<3 ; i++ )
+ 	    close(i); /* Close STD-IN, -OUT, -ERR */
+ 
+-	system("./tux_serv -e");
+-	/* execlp( "./tux_serv", "-e" );
++	system("tux_serv -e");
++	/* execlp( "tux_serv", "-e" );
+ 	   perror("execlp"); */
+ 	exit(-1);
+     }
diff --git a/games-arcade/xtux/xtux-20030306-r1.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild
index 929e81c88666..55e94f38231a 100644
--- a/games-arcade/xtux/xtux-20030306-r1.ebuild
+++ b/games-arcade/xtux/xtux-20030306-r1.ebuild
@@ -1,8 +1,9 @@
 # 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="Multiplayer Gauntlet-style arcade game"
 HOMEPAGE="http://xtux.sourceforge.net/"
@@ -11,30 +12,27 @@ SRC_URI="mirror://sourceforge/xtux/xtux-src-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="x11-libs/libXpm"
 RDEPEND="${DEPEND}
-	media-fonts/font-adobe-75dpi
-"
+	media-fonts/font-adobe-75dpi"
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-particles.patch
+	"${FILESDIR}"/${P}-tux_serv-path.patch
+	"${FILESDIR}"/${P}-missing-include.patch
+)
+
 src_prepare() {
 	default
+	find data/ -type d -name .xvpics -exec rm -rf \{\} + || die
+}
 
-	find data/ -type d -name .xvpics -exec rm -rf \{\} +
-	sed -i \
-		-e "s:-g -Wall -O2:${CFLAGS}:" \
-		src/{client,common,server}/Makefile \
-		|| die "sed failed"
-	sed -i \
-		-e "s:./tux_serv:tux_serv:" \
-		src/client/menu.c \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}/${P}-particles.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
+src_configure() {
+	tc-export AR CC RANLIB
 }
 
 src_compile() {
@@ -47,9 +45,13 @@ src_compile() {
 
 src_install() {
 	dobin xtux tux_serv
-	insinto "/usr/share/xtux"
-	doins -r data/
-	dodoc AUTHORS CHANGELOG README README.GGZ doc/*
+
+	einstalldocs
+	dodoc -r doc/.
+
+	insinto /usr/share/xtux
+	doins -r data
+
 	newicon data/images/icon.xpm ${PN}.xpm
 	make_desktop_entry xtux "Xtux"
 }