gentoo Easter resync : 12.04.2020

22 files changed, 476 insertions, 238 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index e166096b2a48..89b6e92c64fe 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index e64d5a17eb09..2bee2655e095 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -6,5 +6,5 @@ AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8c
 AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207
 DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7ee766d7c493a6faf0e2fa321ee2d2d757f5f294418208ac97a440d58bae03d40de2615e421bb8e9fad7a8ba5220d354 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef
 DIST amphetamine-data-0.8.6.tar.bz2 928775 BLAKE2B 078de623c719ebaedae3137fe3876ecd7ba02ad7ec44a64b7775fd173a42b399d137a3862d3fe426780a234638b0876a1f0fc5a06d6ab8f4b3c4ca66df367a49 SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1
-EBUILD amphetamine-0.8.10-r1.ebuild 1067 BLAKE2B 0d48c24d55829e85d6274a6a804d47d93b7e82b663ed587ee02f8ea867c6c40fede0a8c1681ba1722c9bd9ace0fbf4738ae4252ae6c662119df9b6eaf64d00b2 SHA512 7d45e8aa581a11bea5248d250a74274c5ed01f4f058d1c43dce4b26a3907eb664939e9a23ed00a6b814a23c75ba9616fdbf86fe6d620568875134cb391ef62f0
+EBUILD amphetamine-0.8.10-r1.ebuild 1004 BLAKE2B 11e7a7116ab5a30316a1257f83f4d61cfe972b588e796cb66fe17cdcd5f10a90bfa156dbadc640231813fdb18a1c88d981e2363b4e578806f15efcddee2fec19 SHA512 837a2dabcbfffee5014d88dc541909e44442ed63645b039974b91d19ba93d2c3e3824fb58219a0965753232be309064073601c3e810db85ce470f4f5b454848e
 MISC metadata.xml 371 BLAKE2B 12bcfb84a083c0001e99fa3f002b259a5a448f895af66240422d951fc82e4d8635849b8604e588d977c99b47681bc9c3282217a81f107ba7a646fbdbc31f7bb1 SHA512 84d30e975d4eb430e73220b406c49c6d1015f0b449df73af8ff5aa4811a6634f5e90f2db52b28e4a39a1159cbdebc89d9dcb857821401a82156716ab94d5e8c5
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
index 8e9dd07e370e..608047e72a0a 100644
--- a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
+++ b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
@@ -1,22 +1,26 @@
-# 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
 
-DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
-HOMEPAGE="http://homepage.hispeed.ch/loehrer/amph/amph.html"
-SRC_URI="http://homepage.hispeed.ch/loehrer/amph/files/${P}.tar.bz2
-	http://homepage.hispeed.ch/loehrer/amph/files/${PN}-data-0.8.6.tar.bz2"
+DESCRIPTION="A cool Jump'n Run game offering some unique visual effects"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PN}-data-0.8.6.tar.bz2
+"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video]
-	x11-libs/libXpm"
-RDEPEND=${DEPEND}
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	x11-libs/libXpm
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index b3adb3eb95b9..9c9955e668cb 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,7 +1,5 @@
 AUX commandergenius-2.3.1-build.patch 451 BLAKE2B 5c82e9919262fd55ec89069c55de2ba0f18eea2af4587776c353345aef7fb1657763abfcf0956856dae3707a65f0e33210dc521f95d3a0c863461bdb851667d6 SHA512 7b567072137af294b876da4d3701deddc5bf80c52c7a9bf7f0e266885f2a5cc61b7f495725e9d3fdaf3527cf92da0437c8ed1b90f34f9925579c2fe5da8484fb
-AUX commandergenius-2.3.1-desktop.patch 1614 BLAKE2B f2b4a66d98af114a98a83a0ee7ff8ad8dd08d5c0ddba82859b2887adaa8f7893fa6b0cedce5327c7be8f2c0ac8085981b893126e1a39ac4c1effa8212e91b890 SHA512 b03232cda867870b9d8f787463cd423cf805c0bb911c3d371fbb7664ec27e0a0f47706b86889025eb5158e99cc24ac04dbf785d2ff8ed5a292beaeb995e0d75e
-AUX commandergenius-2.3.1-minizip.patch 2277 BLAKE2B d41e86021769db7189620b3ac6941d2a0c1d60efb97ddee30b449045a7d561011638cb56cfab4285b0c7a35a385a6c66d7159f4b01b42fae0c6f363d7d2d6054 SHA512 ff8a1a8fd6c1c87b52b05fcd248b3ba92e2b9559b8b68522ef83a49878d7ccd3d4c8d9ac2eebb8211e4213b4106f563eb59819117b962a28ecdfd9c60d29621d
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
-DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe SHA512 f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
-EBUILD commandergenius-2.3.3.ebuild 2277 BLAKE2B 1ac640057e311d1c6c7f7ccc9ccadd2abd0dd0dfeefa8807a5343fb5f0a7378743343035d5d66848d542d494a72e2b34d61530cc38dc6a528c05662c93d041c9 SHA512 099908a6ad457fa72c102c841879862253265a19617a74022a76f990fb5b9351cbcfc9bf389ef1d7790667eb6cd1bc1c511eac2f289f5b52878b124d8b392284
+DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b
+EBUILD commandergenius-2.4.0.ebuild 2192 BLAKE2B 6f56b9049b899ddc3c253e6d33ab901f3c993aabe1b2b093e54aee81b162a340e43fa43a34243a87d4ff7f598c67be3ba7f8530fad8a25a2941f6bb696b07781 SHA512 8413ea6c69c56162c4d4d630fcd1911cc01ff88eb712bd94033955eb5dd08bc691f8572afae543de4a6b612ec10c336768791ee017b3d68249bcfcb0a56a9084
 MISC metadata.xml 506 BLAKE2B 2e4a746b047d9e50d4403cdd52984cc2f0e8ba58e81ac73b6d3e3363f60c8370221713248fcf56505ad5768f7f66dd30778d025b8342088fa9c329deb7afac20 SHA512 f7e6dd9ad5ba4e57218226ec1693e482228133d3e19332a9aa7995bf60e184a77520a59d7d2b3195429c3b56ecb857da675d467b05b1b9aeb52826500db2061a
diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
index 9a139cff2fa3..9baded9ec4a0 100644
--- a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8} )
 
-inherit cmake desktop python-single-r1 xdg-utils
+inherit desktop python-single-r1 xdg cmake
 
 MY_PN="Commander-Genius"
 MY_P="${MY_PN}-v${PV}"
@@ -20,22 +20,25 @@ IUSE="+downloader opengl +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="mirror" # contains keen files, but we do not install them
 
-RDEPEND="media-libs/libsdl2[opengl?,video]
+RDEPEND="
+	media-libs/libsdl2[opengl?,video]
 	media-libs/sdl2-image
 	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
 	sys-libs/zlib[minizip]
 	downloader? ( net-misc/curl )
 	opengl? ( virtual/opengl )
-	python? ( ${PYTHON_DEPS} )"
+	python? ( ${PYTHON_DEPS} )
+"
 
-DEPEND="${RDEPEND}
-	dev-libs/boost"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
 
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.1-minizip.patch
-	"${FILESDIR}"/${PN}-2.3.1-desktop.patch
 	"${FILESDIR}"/${PN}-2.3.1-build.patch
 	"${FILESDIR}"/${PN}-2.3.1-paths.patch
 )
@@ -52,10 +55,10 @@ src_configure() {
 		-DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
 		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DDOWNLOADER=$(usex downloader)
-		-DOPENGL=$(usex opengl)
+		-DUSE_OPENGL=$(usex opengl)
 		-DUSE_PYTHON3=$(usex python)
 		-DUSE_SDL2=ON
-		-DBUILD_SHARED_LIBS=OFF
+		-DUSE_SDL_TTF=ON # Crashes when disabled.
 	)
 
 	cmake_src_configure
@@ -72,7 +75,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	elog "Run ${PN} to start the game. It will search for game data"
 	elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
@@ -86,7 +89,3 @@ pkg_postinst() {
 	elog
 	use opengl && elog "You may also want to set \"OpenGL = true\"."
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
deleted file mode 100644
index 4d2c246e5b76..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 84243052d0b9409b4d5b28e751e598287b00bab9 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 24 Feb 2019 21:26:38 +0000
-Subject: [PATCH 1/2] Remove deprecated "Application" entry from desktop
- categories
-
-The desktop-file-validate tool says it is deprecated.
----
- share/cgenius.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/cgenius.desktop b/share/cgenius.desktop
-index 8d0771522..b7b39ffef 100644
---- a/share/cgenius.desktop
-+++ b/share/cgenius.desktop
-@@ -6,4 +6,4 @@ Icon=/usr/share/icons/hicolor/512x512/apps/CGLogo.png
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=Application;Game;ArcadeGame;
-+Categories=Game;ArcadeGame;
--- 
-2.20.1
-
-From e9d6157210015b4aa5efcb9ba0c57842ae4ef266 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 24 Feb 2019 21:31:28 +0000
-Subject: [PATCH 2/2] Remove unnecessary absolute icon path from desktop entry
-
-We should not assume that the game has been installed to /usr and
-there is no need to specify an absolute path for the icon anyway as
-the standard says that bare icon names should be looked up.
----
- share/cgenius.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/cgenius.desktop b/share/cgenius.desktop
-index b7b39ffef..9b09ec9fc 100644
---- a/share/cgenius.desktop
-+++ b/share/cgenius.desktop
-@@ -2,7 +2,7 @@
- Name=Commander Genius
- Comment=Play natively Commander Keen Games
- Exec=CGeniusExe
--Icon=/usr/share/icons/hicolor/512x512/apps/CGLogo.png
-+Icon=CGLogo
- Terminal=false
- Type=Application
- StartupNotify=true
--- 
-2.20.1
-
diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch
deleted file mode 100644
index ca2553b5f7d3..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 04f776e73248d19d9beaf4ea8d407b7c85ecc9c9 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 24 Feb 2019 20:25:34 +0000
-Subject: [PATCH] Allow use of external minizip library instead of linking just
- zlib
-
-Some distributions package the minizip part of zlib, as well as zlib
-itself, so allow that to be used with help from pkg-config.
----
- src/engine/unzip/CMakeLists.txt | 42 +++++++++++++++++++++------------
- src/engine/unzip/miniunz.c      |  4 ++--
- 2 files changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/src/engine/unzip/CMakeLists.txt b/src/engine/unzip/CMakeLists.txt
-index 5f2b8a959..24833abb7 100644
---- a/src/engine/unzip/CMakeLists.txt
-+++ b/src/engine/unzip/CMakeLists.txt
-@@ -1,23 +1,35 @@
--find_package( ZLIB REQUIRED )
--if ( ZLIB_FOUND )
--    include_directories( ${ZLIB_INCLUDE_DIRS} )
--else ( ZLIB_FOUND )
--    Message(FATAL_ERROR "Zlib development packages not found!")
--endif( ZLIB_FOUND )
-+find_package(PkgConfig)
- 
-+if ( PKGCONFIG_FOUND )
-+    pkg_check_modules(ZLIB minizip)
-+else ( PKGCONFIG_FOUND )
-+    unset(ZLIB_FOUND)
-+endif ( PKGCONFIG_FOUND )
- 
-+if ( ZLIB_FOUND )
-+    set(CXXSRC miniunz.c)
-+    unset(HSRC)
-+else ( ZLIB_FOUND )
-+    find_package(ZLIB REQUIRED)
-+    include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
-+    set(CXXSRC
-+        miniunz.c
-+        ioapi.c
-+        iowin32.c
-+        unzip.c)
- 
--set(CXXSRC
--    miniunz.c
--    ioapi.c
--    iowin32.c
--    unzip.c)
-+    set(HSRC
-+        ioapi.h
-+        iowin32.h
-+        unzip.h)
-+endif ( ZLIB_FOUND )
- 
--set(HSRC
--    ioapi.h
--    iowin32.h
--    unzip.h)
-+if ( ZLIB_FOUND )
-+    include_directories( ${ZLIB_INCLUDE_DIRS} )
-+else ( ZLIB_FOUND )
-+    Message(FATAL_ERROR "Zlib development packages not found!")
-+endif( ZLIB_FOUND )
- 
- add_library(unzip ${CXXSRC} ${HSRC})
- 
-diff --git a/src/engine/unzip/miniunz.c b/src/engine/unzip/miniunz.c
-index 694aa8e60..0f289c96c 100644
---- a/src/engine/unzip/miniunz.c
-+++ b/src/engine/unzip/miniunz.c
-@@ -56,7 +56,7 @@
- #endif
- 
- 
--#include "unzip.h"
-+#include <unzip.h>
- 
- #define CASESENSITIVITY (0)
- #define WRITEBUFFERSIZE (8192)
-@@ -64,7 +64,7 @@
- 
- #ifdef _WIN32
- #define USEWIN32IOAPI
--#include "iowin32.h"
-+#include <iowin32.h>
- #endif
- /*
-   mini unzip, demo of unzip package
--- 
-2.20.1
-
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 9dfab1a0b725..ec8e4e9b1bb6 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,3 +1,6 @@
+AUX 3.36.0-drop-unnecessary-files.patch 877 BLAKE2B f9ca65d20efbf9b40220274881328584803f0395f233062d395c21ca0192399855b78ac7e7da7ee72d08a16736bd62bbc5670f6abbaa1c98500fb4f82917c66d SHA512 9435b8aa2caf1f9cd058ed5fbda629237c67cd9ff161be57947612ed093498d3060b9130e608211b174323a83ba18d528c606a50e8cc156aa394f192a1192d93
 DIST gnome-nibbles-3.32.0.tar.xz 495180 BLAKE2B dd7c14a1ec3900e25b64f92519c51eadedf5eac6faa9f8a35612876cf2bb796049f278e904e796aba427f579c5bda093a15dd5310141b9dd7be179b0ecf5b629 SHA512 f151b66edcde40e971113cdff7f3b92d740b2f04d943a168cc5471a18fabf5649d31d68beb3ad3ce29f91b36d34ff49725ce0c67f87184f6af1cafd0aed92349
+DIST gnome-nibbles-3.36.0.tar.xz 317624 BLAKE2B 6b9a582964ba03520e83900bdf00043133edac3ec3fd63a183687875026f70349efa737fd0f6e27fa2feeaf577f1e2957bd02a24213c2ddd573f6fae7c695922 SHA512 f7753589e2bab5d87528cf5dd4365fdc0920555d480cac225f99a9bb5b6c5670779d43602ce8f715c6a185a304c606a1121fb139eb493df69d17a40dffa8d4a4
 EBUILD gnome-nibbles-3.32.0.ebuild 716 BLAKE2B 11ca8083505a9fc3716a456ab0723c88fc726a4988d7972bc77f36b6357e4fe7f6bee0b96db8409e12616ff78a82392dd9c2dee102edd8eb2aeea19d33a5ddda SHA512 6f5181899f083939fc5d01cef0b20837efeb71af98d52ac7d22f224ba6dd40fc3a72407281c311e439aa47452613a59d3461407b72920668f95101547920525f
+EBUILD gnome-nibbles-3.36.0.ebuild 980 BLAKE2B 153039a84906d97f676a04c9e29f39e72aa58773dfe6aa27971fc9cfa503b49207ad518d86c4130d569db961b89b581790a40f6bac6555e8c8b52aee0ef315a1 SHA512 67630ad8fddeda7b270a00906b69ffc2d9144218bd4ec20e0d6a090a0ed59becb869cf8a1e999a791b346ac5e7761abcd00978a818aa7438075d3446fe086f22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch b/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch
new file mode 100644
index 000000000000..63ae21026066
--- /dev/null
+++ b/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch
@@ -0,0 +1,34 @@
+From 2ca8c1e70635eba7f667e5d97b6d85bda2374b9e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 29 Mar 2020 19:13:14 +0300
+Subject: [PATCH] meson: Don't install data files consumed as gresources
+
+Fixes #36
+---
+ data/meson.build | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 08fa461..0492411 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -32,16 +32,6 @@ install_data([
+     'teleport.ogg'
+ ], install_dir: sounddir)
+ 
+-# UI files
+-install_data([
+-    'nibbles.ui',
+-    'nibbles.css',
+-    'scoreboard.ui',
+-    'player-score-box.ui',
+-    'controls-grid.ui',
+-    'preferences-dialog.ui'
+-], install_dir: pkgdatadir)
+-
+ # Icons
+ foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48' ]
+     install_data(join_paths('icons', 'hicolor', size, 'org.gnome.Nibbles.png'),
+-- 
+2.20.1
+
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild
new file mode 100644
index 000000000000..a8604f0c04cd
--- /dev/null
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.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}"/${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 5bcbdc076f41..ba8c4836d290 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-robots-3.32.0.tar.xz 422684 BLAKE2B bf66057da9ed52ffe641d28aa522d7851a1ac7881369d1329507beffdeb3f9dc6a46988993c899783576e8c63730245dd340b62267809d1334515dabc2d599e4 SHA512 b037d576eea45843ae4c13ddf284a598931b295257688f6fa458fb4e33b987c01dd70d34007703b3f7bcb97cf8aa306e6473e4c24e5ee0253f1beaafcff1c6f7
+DIST gnome-robots-3.36.0.tar.xz 425616 BLAKE2B 1d5a3a0a087ace46af17fd97d7c284ba722d9bec22b9694ebd16b3d18fe1d87e656c6dcfc7b4687c60ea5015577c8319d967b8ad705d3d4d5e398df35c392068 SHA512 8e5eb03f74c1092c26148d0818c9e8118144dbb70c6cb25db449316ede05ff892a9ad06df2e8dc9942fe8c4f5ae638a1c8a8cda381f78f6f01a80c19010df35a
 EBUILD gnome-robots-3.32.0.ebuild 748 BLAKE2B 738526de05754bc10d59628d71633cce42426cca98744aad8f778e0dded92416b7173381f12dbe6015383849d5e8d07e543a753fe2e63130e07674213196db04 SHA512 0c812d687c72331b67c39580ff8a1283497f9ae1fa020f65c340be8c4cef9270f9c7936e097c62a16cca127e08f448fc32956849ab7ed3fd935c95a4e8c42793
+EBUILD gnome-robots-3.36.0.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.0.ebuild b/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild
new file mode 100644
index 000000000000..fc66f1d18315
--- /dev/null
+++ b/games-arcade/gnome-robots/gnome-robots-3.36.0.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/jazz2-data/Manifest b/games-arcade/jazz2-data/Manifest
new file mode 100644
index 000000000000..7398ac5c46a1
--- /dev/null
+++ b/games-arcade/jazz2-data/Manifest
@@ -0,0 +1,6 @@
+DIST jazz2-shareware-demo.zip 7658261 BLAKE2B b2b4412cd62feba07878a091a2a47d432a10d09f5f552eeb49095938d9ca6f97e94ab31e9cc8545019d9bdd8e5f97270dd9c1b25ba2099b260ff731dee5847c6 SHA512 208aedbb581f001c8215932166c71e5a160c70af6343d06aa35211558f898f18c47f066c896f016372aaefc8dbc495bc28ace18ce5fcbb729a9d2444a445d9ce
+DIST jj2plus-v1.zip 153487 BLAKE2B 49867cd3d30ee26e8795a7983657f7092710d43b0b8f083853bd0284fc5e1917954951a796747f4700ab43f82633886eb7fa229950fcc003c798f24fd9c33209 SHA512 139b8f98a6c4b8bb7067893e4387af540e7c15d1e633c5f964d7a6ae64320ad1a432434403a74aa4b4af36e3d4eb5245e74ade395ea473c8fd2e3fc37cef06a5
+DIST setup_jazz_jackrabbit_2_1.24hf_(16886).exe 58050816 BLAKE2B 6a6492aedc3d7387e5ef5bfc641d54c46dbe850f65f9269268c962cf963164dcd98c2f2651e9dc3b7c2d0ea9ea00836e9cc1332a158b08c34f8fa9fbfb44859e SHA512 df6fc47abf24aaa1895df5f897f698b53865fdc499e2454e07b273eddc8fcdeeebe8fc2992292fb27e077da252d3d5728823ce6a2e83412c150fb8742a52116f
+DIST setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe 57273872 BLAKE2B 85cd51fbe706bd6a040931d084102cf46c13d3508653ac429f721b93b8bcef131bea688a1d49cc6e789fa108fed5611e2bd476a2f50ceee4ac0c16531d49795a SHA512 fafce9bb318903970b8ba8e3c08cd261c748180158c162db4f67408d12b436a1a091b2423e2df0859e6c65df5ffe1e7e07d370089b6ebf70f8fc32ff5c260a86
+EBUILD jazz2-data-0-r20200327.ebuild 1776 BLAKE2B f9675dbb7487d4f0a7d5958dd3f6a9779c45eff546ad3ce325ebd9d6fda5fafee6dad49b7e09c68ddbeb400cf41118f965ffc20ea62b4cb3083e79b340e2684e SHA512 639a526f0eb5c064f2af574a9be3a90610f0e0b9bc75e05595c8d609290b3bfe5dd3b34eaf5a0e879a1b71d7b788642f1abc2fbb98bf1a318014162907a73f24
+MISC metadata.xml 593 BLAKE2B 67adaa430c4dc2579b2ff26ea546d139b8fc8f2bf736d67988ada0b41274b13ecf8ff7c5c39733ee928785ecb296ef417c86986e1e9a43f210f51171e7b00063 SHA512 b5a00de5f6a30b8a99258379e8b620821cfbc7d3d0245c042e011e93a555c6e668acad1dbb3c0c1d8e4c698c6e04e6fd215e261834a286d6506f700ed95779b5
diff --git a/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild b/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
new file mode 100644
index 000000000000..10ac074109cf
--- /dev/null
+++ b/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DEATTK="http://deat.tk/jazz2/misc"
+JJ2PLUS="${DEATTK}/jj2plus-v1.zip"
+
+DESCRIPTION="Jazz Jackrabbit 2 data files imported for games-arcade/jazz2"
+HOMEPAGE="https://www.gog.com/game/jazz_jackrabbit_2_collection"
+
+# Order is significant!
+SRC_URI="
+	${JJ2PLUS}
+	demo? (
+		${DEATTK}/shareware-demo.zip -> jazz2-shareware-demo.zip
+	)
+	!demo? (
+		cc? ( setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe )
+		setup_jazz_jackrabbit_2_1.24hf_(16886).exe
+	)
+"
+
+LICENSE="free-noncomm GOG-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cc demo gles2-only"
+RESTRICT="!demo? ( bindist fetch )"
+
+RDEPEND="games-arcade/jazz2:=[gles2-only=]"
+
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	!demo? ( app-arch/innoextract )
+"
+
+DIR="/usr/share/jazz2"
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	local a
+	einfo "Please place the following files in your distfiles directory."
+	einfo
+	einfo "  Go to https://www.gog.com/game/jazz_jackrabbit_2_collection,"
+	einfo "  purchase the game, and download:"
+	for a in ${A}; do
+		[[ ${SRC_URI} == */${a}* ]] && continue
+		einfo "    - ${a}"
+	done
+	einfo
+	einfo "  You must also download:"
+	einfo "    - ${JJ2PLUS}"
+}
+
+src_unpack() {
+	ln -snf "${DISTDIR}/${JJ2PLUS##*/}" || die
+
+	if use demo; then
+		ln -snf "${DISTDIR}"/jazz2-shareware-demo.zip shareware-demo.zip || die
+	else
+		local EXE
+		for EXE in ${A}; do
+			[[ ${EXE} == *.exe ]] || continue
+			innoextract -e -s -p0 -I app -d "${EXE}" "${DISTDIR}/${EXE}" || die
+		done
+	fi
+}
+
+src_install() {
+	if use demo; then
+		jazz2-import /no-wait /output "${ED}${DIR}" || die
+	else
+		local EXE
+		for EXE in ${A}; do
+			[[ ${EXE} == *.exe ]] || continue
+			jazz2-import /no-wait /output "${ED}${DIR}" "${EXE}"/app || die
+		done
+	fi
+}
diff --git a/games-arcade/jazz2-data/metadata.xml b/games-arcade/jazz2-data/metadata.xml
new file mode 100644
index 000000000000..9ac6d5d0b96a
--- /dev/null
+++ b/games-arcade/jazz2-data/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+	<upstream>
+		<remote-id type="github">deathkiller/jazz2</remote-id>
+	</upstream>
+	<use>
+		<flag name="cc">Install The Christmas Chronicles additional data</flag>
+		<flag name="demo">Use the free demo data instead of the full retail game data</flag>
+		<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL 2.1</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest
new file mode 100644
index 000000000000..90dc6fe6158c
--- /dev/null
+++ b/games-arcade/jazz2/Manifest
@@ -0,0 +1,3 @@
+DIST jazz2-0.6.3_p20200327.tar.gz 11030066 BLAKE2B 64340e6aeca9635c2d30f7814c87eb6d48d1e8674554342a1563371e305dc0f9d85929d51c0e26d6a0e30899e0d4b916ad9daa4fde51b4e98e07693f0e5c08cf SHA512 ebb406a2e57f6bf50b23a068f3b640e03c5ccce0e36de686debaacec25d67075cacb60888a7de451028cf4622932e4d282d47d674e5de9230bd4a21c83393896
+EBUILD jazz2-0.6.3_p20200327.ebuild 2066 BLAKE2B 4785f5a8e6e552d4f541917278dd20ff4eb348eeacc5e7b88cb8fdf338c5370e357f01fbb17bf19e97d18b9d3b5490cf5124eb064e54b314b50c668c355b1cbc SHA512 cd9a8cf0c36bb4266fd17b6efb30b6b097b34befab344e2f894b549b796f0fdb29fd337e53f21eb0557f9c58f1f32af353821d64d4efa44950fa82882b69ed30
+MISC metadata.xml 495 BLAKE2B 38d96adaa7df348574ca3a8f1602a2bb08ec578c21fbbffe5138b0c394d045c8cc66f40383401d8aeb372189e8dc55a2290b7951063554ed68d88db413ec3fe4 SHA512 a851ade899d6e3b6f2983246cd4771cf3b05792f9a3acab18edff3f90839a05718491e9870ab917f30dfbcd7b739f753fc1294a52b3aa25c20f1d2f415a85aef
diff --git a/games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild b/games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild
new file mode 100644
index 000000000000..8d3263f7c62f
--- /dev/null
+++ b/games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop dotnet eutils
+
+COMMIT="5174d3bc2e94676c4ab730aad6c68bf17b5406dd"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2"
+HOMEPAGE="http://deat.tk/jazz2/"
+#SRC_URI="https://github.com/deathkiller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/deathkiller/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="gles2-only server"
+
+RDEPEND="
+	dev-lang/mono
+	media-libs/libopenmpt
+	media-libs/libsdl2[video]
+	media-libs/openal
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+"
+
+FRAMEWORK="4.5.2"
+DIR="/usr/share/${PN}"
+
+src_prepare() {
+	default
+
+	# Android/WASM only.
+	rm -r Content/Shaders.ES30/ || die
+
+	if use gles2-only; then
+		rm -r Content/Shaders/ || die
+		mv Content/_ES20/* Content/ || die
+	else
+		rm -r Content/_ES20/ || die
+	fi
+}
+
+src_compile() {
+	local TARGET
+
+	MAIN_TARGETS="Jazz2 $(usex server Jazz2.Server '') Tools/Import"
+	EXT_TARGETS="OpenTKBackend $(usex gles2-only Es20Backend GL21Backend)"
+
+	for TARGET in ${MAIN_TARGETS}; do
+		cd "${S}/${TARGET}" || die
+		exbuild "${TARGET##*/}.csproj"
+	done
+
+	for TARGET in ${EXT_TARGETS}; do
+		cd "${S}/Extensions/${TARGET}" || die
+		exbuild "${TARGET##*/}.csproj"
+	done
+}
+
+src_install() {
+	local TARGET
+
+	insinto "${DIR}"
+	# TODO: Package OpenTK.
+	doins -r Content/ Packages/AdamsLair.OpenTK.*/lib/net*/*
+
+	for TARGET in ${MAIN_TARGETS}; do
+		doins "${TARGET}/Bin/Release/${TARGET##*/}.exe"
+	done
+
+	insinto "${DIR}"/Extensions
+	for TARGET in ${EXT_TARGETS}; do
+		doins "Extensions/${TARGET}/Jazz2/Bin/Release/Extensions/${TARGET}.core.dll"
+	done
+
+	make_wrapper ${PN} "mono '${EPREFIX}${DIR}/Jazz2.exe'"
+	make_wrapper ${PN}-import "mono '${EPREFIX}${DIR}/Import.exe'"
+	use server && make_wrapper ${PN}-server "mono '${EPREFIX}${DIR}/Jazz2.Server.exe'"
+
+	newicon Jazz2/Icon.ico ${PN}.ico
+	make_desktop_entry ${PN} "Jazz² Resurrection" ${PN}.ico
+}
diff --git a/games-arcade/jazz2/metadata.xml b/games-arcade/jazz2/metadata.xml
new file mode 100644
index 000000000000..3a5cc6dbaf84
--- /dev/null
+++ b/games-arcade/jazz2/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<upstream>
+		<remote-id type="github">deathkiller/jazz2</remote-id>
+	</upstream>
+	<use>
+		<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL 2.1</flag>
+		<flag name="server">Build the multiplayer game server</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index 672a3f0606a7..82125b7d8028 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -1,5 +1,6 @@
 AUX oshu-2.0.0-use_unpacked_osu-skin.patch 1233 BLAKE2B fb8a41b0fc8c8891e3d1dbe1cca6da320049c30a24b146612e2dcbf5490458b8c5db1ed410e9378552f4f048148b2770caf1f87ca60431b92f5d9f9b12885761 SHA512 4e5a0cfb995710c16f6acba7a02e4f0c25de9fc83b28de8c42279fe8e3dea01c33a2e22e9b43e05ab9996534710199315f36e836e24a41ea212e17b08c30e461
-DIST oshu-2.0.0.tar.gz 144088 BLAKE2B c4383746624f4de62e158a2f94d4e5c1a3e2f037fd05d80607932414f20a031103bd73f108644a93faadf61c21f3d2505da3afd2ea7ea43bd59e32966724928b SHA512 ed2b8294b06d239948c563135d997b422191be681ff86714a244ca64079251508a5a62e23cf3ae1e0ac2b3128b6401901233714eab7787989296ca1700192643
+DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf
 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
-EBUILD oshu-2.0.0.ebuild 1206 BLAKE2B 03af462af767ca12bed363b6080d692c8b0cc58763346956688f8f6f1a40fc2e673113c24eed5e458645f5d673a5b086465ad8c758c5aba1eaa3548fffb3a631 SHA512 d8300aeac277c59968a265759bc5ca15b6b18ad62e5a36994b1ccaeefd6fd160bcdcaafd42c7501460103126fad7aa321df12d9dbbbf1a650b054d1705ca2ab2
+EBUILD oshu-2.0.1.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
+EBUILD oshu-9999.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
 MISC metadata.xml 423 BLAKE2B 0c302dedd0ac0c3bb3295da6a5ae4e568e848f25d2e03f3276fc37f3053ad46df131a4cff5c7ee2b83061f312c06b090b6a66fad5fd64137d2f9d97ec241143c SHA512 c30495d814265e4a2a18c4ef01e4ea7436d0cdcc14838932aa6d52d87354db8e6bff45519f7a8e333c92bd699b4e903cc1b7aad614455314788007a227857bf6
diff --git a/games-arcade/oshu/oshu-2.0.0.ebuild b/games-arcade/oshu/oshu-2.0.0.ebuild
deleted file mode 100644
index 24f021264b5a..000000000000
--- a/games-arcade/oshu/oshu-2.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MIN_VERSION="3.9.0"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Lightweight osu! port"
-HOMEPAGE="https://github.com/fmang/oshu"
-SRC_URI="https://www.mg0.fr/oshu/releases/${P}.tar.gz
-	osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3 CC-BY-NC-4.0"
-SLOT="0"
-IUSE="libav osu-skin"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.5:=
-	media-libs/sdl2-image:=
-	x11-libs/cairo:=
-	x11-libs/pango:=
-	!libav? ( media-video/ffmpeg:= )
-	libav? ( media-video/libav:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	if use osu-skin; then
-		epatch "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
-		mv "${WORKDIR}/osu" share/skins/
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
-		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-arcade/oshu/oshu-2.0.1.ebuild b/games-arcade/oshu/oshu-2.0.1.ebuild
new file mode 100644
index 000000000000..f394d8081789
--- /dev/null
+++ b/games-arcade/oshu/oshu-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+
+if [[ $PV = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
+	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+else
+	SRC_URI="https://github.com/fmang/oshu/archive/${PV}.tar.gz -> oshu-${PV}.tar.gz
+		osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="osu-skin"
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+	x11-libs/cairo
+	x11-libs/pango
+	media-video/ffmpeg:=
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if use osu-skin; then
+		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/ || die "Failed to move osu-skin"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
+		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild
new file mode 100644
index 000000000000..f394d8081789
--- /dev/null
+++ b/games-arcade/oshu/oshu-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+
+if [[ $PV = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
+	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+else
+	SRC_URI="https://github.com/fmang/oshu/archive/${PV}.tar.gz -> oshu-${PV}.tar.gz
+		osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="osu-skin"
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+	x11-libs/cairo
+	x11-libs/pango
+	media-video/ffmpeg:=
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if use osu-skin; then
+		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/ || die "Failed to move osu-skin"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
+		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}