gentoo resync : 28.11.2020

9 files changed, 140 insertions, 261 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 5c04191a4dcb..8c359b0afcc8 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 6ca4a4ba0984..a9ea995d1c7f 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,16 +1,12 @@
 AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
-AUX ppsspp-1.4.2-assets-lookup.patch 525 BLAKE2B e0614d010e1708cfdfeba376ece25c6bb121e79dae7243988706a80d6ef022ba52286878c9e7c868bbe23aca6c5182ca1e0c6b5baaa6e4b32e2c79eb4febd10f SHA512 9963aad44ce72e9625cdf816bf58743ab8936d8f1fd3c75ac9ddbda5e179cd71fa4d23321c42ba4d56bd472cc016a62430a0c6d8b84792e2851977a5155cbdb1
-AUX ppsspp-1.5.4-ffmpeg-4.patch 1111 BLAKE2B 22478545e76173b2632a1d33d75b3e4ac883331dcb74178b9aafc85fcf5173d81ffb3c8491ff5be4bef7af10660bb62615f9855a6d6ff0c16878fefb89afc198 SHA512 abfd0a1bcb6bcd7fdd116c5f5b0ff6cb2d342bb4aa5231e2d2cf8466ee704a366c4828733b7698a78611cd3f6ac6d9437d9e2eb777a20db609090466fbbd0af4
-AUX ppsspp-1.5.4-stdint-gcc-10.patch 201 BLAKE2B 828afdc3f761a24a2638fa785c7c05e9a35f2ebd94dfd2dad5609019a5405495a82fe4961ba8bd994ccfc5eb28beacc46b9804a257a829ce03f095bfbc543a57 SHA512 98c0722fe8c9aeb661ec7bbe20380eb549feec85e08c451482d6120e49c5b0cefa97cbc65b381c27a26e4db6d4bc27729eee7f1d2b44f74f4cb2c3496244b001
-DIST ppsspp-1.5.4-assets_lang.tar.gz 347859 BLAKE2B 648915773856a64dafb5d159e0917b4345ff99dba7b7dae4f343ecd81e1d835cb958766ab8928118ae4768564414e3dcceba474e05e99be23d56c9447c59786b SHA512 72983f01c51900fa133ca83d226a5daec78153c9d70fc1ca6233b531f3c5d5da5e307e377560789cecccad7a98ba8f66da104cc4375f51576f90c535dc980b98
-DIST ppsspp-1.5.4-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
-DIST ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz 228943 BLAKE2B 0b4ed8a751737bf6fce9fa766f0b8dc0671b49a6adf026c369ebd3776d9d8c23acd08b6d3f41666a6e23410ffb243917a844d9de85e3eca5ce04935421aaca98 SHA512 5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8
-DIST ppsspp-1.5.4-ext_armips.tar.gz 191245 BLAKE2B 8bfeb8828bc2496c0222b22547820f00c5a695dc9469a2ce6b8fe7bc15e72af862a957e632af1829bfdd4cf663a586baa10495896971b9b138780ddc387aae9b SHA512 9ab376b928fadcbff7256ff10d6581e4960e00e48a93f47f7e90b1998022a8d03cadef20880aa020fe6b62e4fa43cf28fc68dc5b10e93b1212fd6788ae493dba
-DIST ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz 22284 BLAKE2B d37c35efeb42e3998603127f8758cec29103b5f7700ff465d5234e032822965e9249b6d183dba9962a76bed06abeaf0c40ab701425d1fb4d64ffd83c9987fe8d SHA512 fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1
-DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B a9bfae046335f8cba72fc92208fd0370d1808d242c00964c5507ce7d6aab2ad10ef839e8f46c46ba9ac039e11469e26877f89a51843ad035f33b434212a18317 SHA512 333a93707e067ac1d98c69533c2d206675d75aa54195326accf33e8401ac2fb412d2e2525b0ee1313f141872aa6ea430ae5424e8712483c59f77dc3adbcb4f59
-DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
-DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b SHA512 1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f
-DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B 10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db SHA512 dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714
-EBUILD ppsspp-1.5.4-r2.ebuild 3251 BLAKE2B 2e38f51c429f679d8fbf437f2aed21cce48a4ee7f06906c8ee4b711327da1cf1448316b1c21869e55f6cdf75a46a1d08fa943206f2325e8fa83c2eeac482a6ce SHA512 ee7e8861f3c3f54f0147442c98139feaddfdf69d3074fbd5f1a57a6b12a3917b8d51fc5ff2ab419c5877c547830716c921a45aa3ebf7fd0a8710eec8dfd7824d
-EBUILD ppsspp-9999.ebuild 2197 BLAKE2B 6ab498d6e02727c4e9f13818b7fed55af2ebdf4f84038986194da1fb32c8d0ae43894d08bd4552455cf512de5f0e3a4a307bbccb37f2cd0d3db7ec7f26a403c1 SHA512 fa8e8db5ad6885d02ff30675e1cfb1c56762f3caa63b318b2dace273d78a340e49d8ca93d8758bc57ed94f5081b6eae63c558558ad22095a4d0f7082c442f1d3
-MISC metadata.xml 487 BLAKE2B 2b141f160af50cfa70e6c8cff123db36bea9c29ea4f96d3f25092d71fa0a1c061f6db7f5c4c012ced2165c6da9649b21aadcf417de0ae2e4a6c9217f03a6d700 SHA512 043e4876c162ea66401fdeefc9e40e4cd2b7f86c9262635a0039e5df37b1a992785cccfcd9eefe04b4375dfe9c406e5e0a79f7348fabc683ce8f40897e444358
+DIST ppsspp-1.10.3-assets_lang.tar.gz 623227 BLAKE2B 91bccaca863ffead629a00783d9afba8d8975a76085ce48bf7e8fa515f60c7e850b7aad023a365955576fc0093c1e2f33813a41225b1728e1cf9431034d199a3 SHA512 5f023b7a4ecade3d88aa36ecf724fcf98200de05fc25797f1895ec3fa952dc01256a181f88d2fe3c283151c83ef502c63939d13160e4d1252f2d47d00bd54223
+DIST ppsspp-1.10.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
+DIST ppsspp-1.10.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
+DIST ppsspp-1.10.3-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af
+DIST ppsspp-1.10.3-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3
+DIST ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
+DIST ppsspp-1.10.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
+DIST ppsspp-1.10.3-ffmpeg.tar.gz 387126903 BLAKE2B fd838039dda32f1b9d16649bd7e5a5d6fb3db74a8032d51973b01e567dd97c06c3d16b82a5176cb5828178f47619d767e1e0473a31484ab957636502a5172fa0 SHA512 74a8ee678c16578af63af3a6dd11dbd7bba265bc6581ff78c19269cff1b2896e236c6468175eb19c3c321ee67ebe1d62b4ff179163bb7162089c953a18483cf7
+DIST ppsspp-1.10.3.tar.gz 16956980 BLAKE2B 3f02abaf68a3a2acbaf71936fe70904a5065eb5c8afc8ec00804c325c597c4bf57fb4b9c7e1df7b302c085043a0ad210ca0d6ed2be89dd6ed28c9c635afff8db SHA512 522b2014810bd39a8554920b6d9bec7c47334d51537a7ca41482f629622b9e2d3dddfaaa5389b3c6c7dda8d7d3212b7ce9f6bd6e6d8498ffe370cf2cc58aac30
+EBUILD ppsspp-1.10.3.ebuild 3264 BLAKE2B 0a3cb8f78040261c11bf6cca3ea3c83b0c0d1fe7caf8c69ec085c9fc44ff4ac7298199b5336b59536f6ceb823c12a9da176f92a95f4cfdf47b7a2f11953812cc SHA512 c5b8f25b7150f8bfa63bf13d15edbf91824cd5fb837d2f980b785655634566248cc09b85960e23c35057c3bce4ec13ba907e0389e76c94dada7cad3361127031
+MISC metadata.xml 682 BLAKE2B 5d95a098006d02571fb86fef3fc287379d6c7174918de08c169d2239d87fad29ae68126667652b9cb08ed74ea06831573fdfcb37de2e4e65ed4bcdc14d148e28 SHA512 a626149a0a8d462a8124ed8e2d1122beb493624922efe3c44e8ba9a37b081a23b72971b29413b59d613ed417ac9d9a7dca1c300237e97250e079628b483280bd
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch b/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
deleted file mode 100644
index 2a136a39e8de..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
-index 717177ef81ff..22239782210d 100644
---- a/UI/NativeApp.cpp
-+++ b/UI/NativeApp.cpp
-@@ -317,7 +317,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
- 
- 	// We want this to be FIRST.
- #ifdef USING_QT_UI
--	VFSRegister("", new AssetsAssetReader());
-+	VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));
- #elif defined(IOS)
- 	// Packed assets are included in app
- 	VFSRegister("", new DirectoryAssetReader(external_dir));
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch b/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
deleted file mode 100644
index d738d4bc56c3..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 70c54a7d1ab15c0cf84a205b944db7e0339242e0 Mon Sep 17 00:00:00 2001
-From: Greg V <greg@unrelenting.technology>
-Date: Sat, 21 Apr 2018 16:44:45 +0300
-Subject: [PATCH] Fix build with ffmpeg 4.0
-
----
- Core/HLE/sceMpeg.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
-index 592320515e..ae309d7b2e 100644
---- a/Core/HLE/sceMpeg.cpp
-+++ b/Core/HLE/sceMpeg.cpp
-@@ -884,13 +884,16 @@ class H264Frames{
- 		}
- 	};
- #ifndef USE_FFMPEG
--#define FF_INPUT_BUFFER_PADDING_SIZE 16
-+#define AV_INPUT_BUFFER_PADDING_SIZE 16
-+#endif
-+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
- #endif
- 	void addpadding(){
--		u8* str = new u8[size + FF_INPUT_BUFFER_PADDING_SIZE];
-+		u8* str = new u8[size + AV_INPUT_BUFFER_PADDING_SIZE];
- 		memcpy(str, stream, size);
--		memset(str + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
--		size += FF_INPUT_BUFFER_PADDING_SIZE;
-+		memset(str + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-+		size += AV_INPUT_BUFFER_PADDING_SIZE;
- 		delete[] stream;
- 		stream = str;
- 	}
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch b/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
deleted file mode 100644
index 0a7c45a810b2..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Common/Hashmaps.h
-+++ b/Common/Hashmaps.h
-@@ -2,6 +2,7 @@
- 
- #include <cstring>
- #include <vector>
-+#include <stdint.h> /* uint32_t */
- 
- #include "ext/xxhash.h"
- #include "Common/CommonFuncs.h"
diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index 5197ad9867ba..734835063341 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="headless">Build headless version of the PPSSPP</flag>
-		<flag name="system-ffmpeg">Use the system-wide media-video/ffmpeg instead of bundled</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>
-		<remote-id type="github">hrydgard/ppsspp</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="system-ffmpeg">Use the system-wide media-video/ffmpeg instead of bundled</flag>
+    </use>
+    <upstream>
+        <bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>
+        <remote-id type="github">hrydgard/ppsspp</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild
new file mode 100644
index 000000000000..41b2ef1ee03e
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A PSP emulator written in C++"
+HOMEPAGE="https://www.ppsspp.org/"
+SRC_URI="
+	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+	https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
+	https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
+	https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz
+	https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
+	https://github.com/hrydgard/ppsspp-lang/archive/fd6f5bc01afb419eacca538b425c01eb2a055393.tar.gz -> ${P}-assets_lang.tar.gz
+	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/d3e695286cce346274192c214c00f021c00cd575.tar.gz -> ${P}-ffmpeg.tar.gz )
+"
+
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt5 sdl +system-ffmpeg"
+REQUIRED_USE="!qt5? ( sdl )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/libzip:=
+	dev-util/glslang:=
+	media-libs/glew:=
+	sys-libs/zlib:=
+	virtual/opengl
+	sdl? ( media-libs/libsdl2 )
+	system-ffmpeg? ( media-video/ffmpeg:= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtmultimedia:5[-gles2-only]
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtwidgets:5[-gles2-only]
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4-O2.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	cd "${S}" || die
+	local i list=(
+		assets_lang
+		ext_SPIRV-Cross
+		ext_armips
+		ext_discord-rpc
+		ext_glslang
+		ext_native_tools_prebuilt
+		ext_rapidjson
+	)
+	if ! use system-ffmpeg; then
+		list+=( ffmpeg )
+	fi
+	for i in "${list[@]}"; do
+		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
+	done
+}
+
+src_prepare() {
+	if ! use system-ffmpeg; then
+		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package sdl SDL2)
+		-DHEADLESS=true
+		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
+		-DUSE_SYSTEM_LIBZIP=ON
+		-DUSE_SYSTEM_SNAPPY=ON
+		-DUSING_QT_UI=$(usex qt5)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	insinto /usr/share/"${PN}"
+	doins -r "${BUILD_DIR}/assets"
+
+	local i
+	for i in 16 24 32 48 64 96 128 256 512 ; do
+		doicon -s "${i}" icons/hicolor/"${i}x${i}"/apps/"${PN}.png"
+	done
+
+	dobin "${BUILD_DIR}/PPSSPPHeadless"
+	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use system-ffmpeg; then
+		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
+		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
+	fi
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
deleted file mode 100644
index e83d7dac0129..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
-	https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ${P}-assets_lang.tar.gz
-	https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ${P}-pspautotests.tar.gz
-	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
-	https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headless +qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/libzip:=
-	media-libs/glew:=
-	sys-libs/zlib:=
-	virtual/opengl
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		!sdl? ( dev-qt/qtmultimedia:5 )
-	)
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
-	"${FILESDIR}"/${PN}-1.4-O2.patch
-	"${FILESDIR}"/${P}-ffmpeg-4.patch
-	"${FILESDIR}"/${P}-stdint-gcc-10.patch
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" || die
-	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
-	if ! use system-ffmpeg; then
-		list+=( ffmpeg )
-	fi
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEADLESS=$(usex headless)
-		-DUSING_QT_UI=$(usex qt5)
-		$(cmake-utils_use_find_package sdl SDL2)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-	local i
-	for i in 16 24 32 48 64 96 128 256 512 ; do
-		doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-	done
-	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
deleted file mode 100644
index 1f03ec0b1d0d..000000000000
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop git-r3
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/"
-EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"
-EGIT_SUBMODULES=( '*' )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="headless +qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/libzip:=
-	media-libs/glew:=
-	sys-libs/zlib:=
-	virtual/opengl
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		!sdl? ( dev-qt/qtmultimedia:5 )
-	)
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	use system-ffmpeg && EGIT_SUBMODULES+=( '-ffmpeg' )
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	# https://github.com/hrydgard/ppsspp/blob/150619c5a341f372266bec86fd874ac5a1343a43/UI/NativeApp.cpp#L318
-	# patch ppsspp to use /usr/share instead of working dir to find the assets
-	sed -i 's|VFSRegister("", new AssetsAssetReader());|VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));|g' UI/NativeApp.cpp || die "Patching qt assets path failed"
-
-	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEADLESS=$(usex headless)
-		-DUSING_QT_UI=$(usex qt5)
-		$(cmake-utils_use_find_package sdl SDL2)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-	local i
-	for i in 16 24 32 48 64 96 128 256 512 ; do
-		doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-	done
-	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}