gentoo auto-resync : 27:07:2022 - 03:00:38

5 files changed, 59 insertions, 56 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e71d0cf2870d..1f81e4262421 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 377d66efc657..b8f26bb3ffcf 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,13 +1,4 @@
-DIST ppsspp-1.11.3-assets_lang.tar.gz 662203 BLAKE2B 0c1e0852c9ab3b3146f149713710e969c685a89deb68e5853f53426973563908350b9aca9994202ee3d435229bd7992ad5385a63fe87956c2ca142b2d5ca754e SHA512 8976b68ebc8b83ca34be1abe4499ca39c21c21af38b977925cd0d5ef456518fbb3670e8a5f35320bb5037a1dda4603614fadb7abafad8378f45f7713743fe39b
-DIST ppsspp-1.11.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
-DIST ppsspp-1.11.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
-DIST ppsspp-1.11.3-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af
-DIST ppsspp-1.11.3-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3
-DIST ppsspp-1.11.3-ext_miniupnp.tar.gz 438926 BLAKE2B 1bfad3cb6b169cfcc12ea79d566c1897d7a3fddddac61f2c74eb129ff38d99b59dc713b1277a2d672b849fda33f54f7c99dc776080e983e908b7d2844d183fbb SHA512 99f336d44f2cb53f2f79bd65726ea5209023efe264207255161d3b8a0452082ed1830b70db81d8bf5ebbf40db66ed391eb000306b2af0918dfa171093b2680e7
-DIST ppsspp-1.11.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
-DIST ppsspp-1.11.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
-DIST ppsspp-1.11.3-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4
-DIST ppsspp-1.11.3.tar.gz 30067677 BLAKE2B 7c5456d38c55c6c1d6a873d869c6df4f31d271f3dec75fd0c5b4f1f4db6ad8a22ad456ba183f0df84d8e2d293bef6c454843f8149c186a86fcbee127aeee7d9a SHA512 5890ae34f2aa4125a816a0fade46a7422385a0652ff04470c56fe653e3a2a697d55bc77f1d7d119bdfa8dbad313d6a1de18a03d1960eaaa9e987b5ddcfed2f48
+AUX ppsspp-CMakeLists-flags.patch 913 BLAKE2B 7bd5df94b51dad35325586f7ad23284436ba670a8c2218a4a6bfb28fb5a055240aeb0543fe331310a0d86d3661cbdf418689a592139ff832802ba1fabbd10fc3 SHA512 5b2ee899b2fbed7229d4abc027e2a010327be4d334e343f977319c475feaf2d180bd74d3640022d0175b11e8256035c828dd4cf03c8a5b9240c989b2d7f72fb7
 DIST ppsspp-1.11.3_p20210627-assets_lang.tar.gz 664123 BLAKE2B 8d96634eb3e930f7f97e8ac24d97eba1e2e7fce3a8f4dbe5a8a4c0c0438a24e981769c3638d7e7770eb1a3af2827a3ece0996fdba8cf668d2c058e3d20741e94 SHA512 691cb38c65ca20700dc5b91c0dc02eec1839f153e042c87f8f4fd480e44c823c0ece9f4752f5e597f2aa4b5cfb22aaf49d76ff990eb2dd5231cc4065dd62566d
 DIST ppsspp-1.11.3_p20210627-ext_SPIRV-Cross.tar.gz 1441538 BLAKE2B 011a0bc8fea2a5986b5884f315d877d0de111dbda226cc6aa5eaf11c0b2cb14acfd94c1279fb80f0a48b27d1a2117487f634a0888f7499d733261c0ced94ea89 SHA512 be77131814691dfbe65de3a2d3ea65de98c7169824997056637bbce39485327ff0f64e7eed8588237615948824e1f9dff1d083472b8cbccd3748a52379411e4e
 DIST ppsspp-1.11.3_p20210627-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
@@ -28,7 +19,17 @@ DIST ppsspp-1.12.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c6
 DIST ppsspp-1.12.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
 DIST ppsspp-1.12.3-ext_zstd.tar.gz 1868621 BLAKE2B abbd48a18c587fc6c413c3df32aa6b74a1c3d0ed02eacb2e7ad23a4fdab059b092e8df4356cbc799641b42e99587238decc2ae27862142fd8d7be7959ad1fd5e SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae
 DIST ppsspp-1.12.3.tar.gz 31693022 BLAKE2B a3378efaad9c8aa7b6141e454b6663892fb357c264845edd4ebf3e25fc8f9d76d8cc5a45d220ba0549036dd8d06e825105bb72182c4ba621e7618563d4f806c5 SHA512 fe5f5b150cc06ecca68c592fa19396d9a6e573c67da9be0ba98a3db975b0efcb6de694ac224543beaea2a3eb4952d45459e850d6c2f0fe6668536325dd449d38
-EBUILD ppsspp-1.11.3-r1.ebuild 3392 BLAKE2B 1da8ceb90ab29005ecde4f2a102b8793c1bc5e38de84214b40210a3de6dae83af52d8721d1fcc6c4c3fa7dab963e52569dee34c4527a45832e0868696261c1ba SHA512 da657d03e789af965acb55382379bbe2b8cc4ba6add953ea1abffd23678c057ad63d9493f01513057b069f739b809690ec8e631c012fbaf1beead1e1459b27dc
+DIST ppsspp-1.13-assets_lang.tar.gz 664123 BLAKE2B 8d96634eb3e930f7f97e8ac24d97eba1e2e7fce3a8f4dbe5a8a4c0c0438a24e981769c3638d7e7770eb1a3af2827a3ece0996fdba8cf668d2c058e3d20741e94 SHA512 691cb38c65ca20700dc5b91c0dc02eec1839f153e042c87f8f4fd480e44c823c0ece9f4752f5e597f2aa4b5cfb22aaf49d76ff990eb2dd5231cc4065dd62566d
+DIST ppsspp-1.13-ext_SPIRV-Cross.tar.gz 1441538 BLAKE2B 011a0bc8fea2a5986b5884f315d877d0de111dbda226cc6aa5eaf11c0b2cb14acfd94c1279fb80f0a48b27d1a2117487f634a0888f7499d733261c0ced94ea89 SHA512 be77131814691dfbe65de3a2d3ea65de98c7169824997056637bbce39485327ff0f64e7eed8588237615948824e1f9dff1d083472b8cbccd3748a52379411e4e
+DIST ppsspp-1.13-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
+DIST ppsspp-1.13-ext_discord-rpc.tar.gz 2108078 BLAKE2B e89ee4a196167cabaecfab82d191516eb0cf0fa89e35f95b6d118d5baad25f5d13d9002a8dcfe4aba099af7b9c1eb72835eb3baa9e4deaedd2754e99687b5967 SHA512 06205287addabfb343ccd9af997b693ed221fe564355d3629d4dee6c003e768b3f65f2b34eb04ef29807a15c5fa34b04c664212b7e0d15b09ad9a4e4be10a560
+DIST ppsspp-1.13-ext_glslang.tar.gz 3300622 BLAKE2B 0f0d8e043662962f13c4277da335def78a88dd1b35ac2e40b0192f0783c43fd97367d63663764591a5b1eef1bc62c681aa54a402e69c36a8dc50b3595e9e8ba9 SHA512 39b7fd1332dc2f6e29c920961e2a48a33cb7fb36753a0ee5ea8897cb2ad11cec67808ec671cd1bdecbb03eb17f4e83a711013bb20a8cc0831879eb9fbe432bcd
+DIST ppsspp-1.13-ext_miniupnp.tar.gz 449099 BLAKE2B b2bcdee23c817cf309dd9516e32e06f7e1eadc9ae24db3519a2b4e3861417fb79c0708d6d67e8baec3de9e6c5c2bb0a6daff648bf63f7c419192729957e9959c SHA512 f86f558699e75e7f8a58bbb5e94c2a32d703432cef05ffeac0da129113a1fe485cc5ad43b1fcfda11ee1ee398fa434511eccc37633eb5d3dfe8af864097669de
+DIST ppsspp-1.13-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
+DIST ppsspp-1.13-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
+DIST ppsspp-1.13-ext_zstd.tar.gz 1868621 BLAKE2B abbd48a18c587fc6c413c3df32aa6b74a1c3d0ed02eacb2e7ad23a4fdab059b092e8df4356cbc799641b42e99587238decc2ae27862142fd8d7be7959ad1fd5e SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae
+DIST ppsspp-1.13.tar.gz 31675858 BLAKE2B bfad05d3097481699f555ed16582731a512d14ab36214470d76c5437f7d0d634825546a94eb511568cf291e1a785a3ac392222aa3cc01db6a063816d4e7ee551 SHA512 73233c3da6787808696fa961d9c42127e893be088ecb7eb6d2767392b94eccf35b39c476d17973dd2a34891feb17ca33883b50f90f5e90cf9e758bae1a32452f
 EBUILD ppsspp-1.11.3_p20210627-r2.ebuild 3054 BLAKE2B 8ca37316d56bd8af3608f841f559e0c4e6ede699d9d800f1b5bd47ebea7ea279d4790329616bbfcd91fce36a2a21ade079de200d735006e145021efaa8c524d6 SHA512 902a956249dbcead560594b174f5e7d525bfbde2852133f643d939854f94b0dfc4bc8609a225137668adb0cc2d6eaf342b219973335a791c10012ea19ab5a67a
 EBUILD ppsspp-1.12.3-r1.ebuild 2960 BLAKE2B 1acd9ad12a4703b3bbcfb45518ade6475b0db80e45804dc3564318eb9791f5089f73a4132ba0edf463cc61580b25c1939be9164a39985969002396808cf189c5 SHA512 4c9b07f9eba1e5c8f70ece68bfe8764e59a3a8bfafcde44820040be8e8fb8a3302cc629e7872b202c3d9bbb0807ecc1d31753a7ce151330fd52cdda7b7e1c3c0
-MISC metadata.xml 634 BLAKE2B 28ec3f1c61837373f50fe759676acfb42ab0b4dcc8634ceac7313eb47c5db4b9996c8dd542217fbb0e8e6a8894d2c159ba2ffc5ca7470996b54125964aefe18e SHA512 3946e60ae6a08f8c1e53c44f3263c594584cf147405b8ab8c7397dab9dc3630cc4c8c6da430fc57d7f02cd39fa163806949c76764bfdea95f93bef7d5a970aca
+EBUILD ppsspp-1.13.ebuild 3018 BLAKE2B 9535171be9755129d1594d6d149ce5790b3c71286291481f43777f8015e81baffdb4e16600f99ad151ebdc1aa1c08b537db2bf54c6588df5536b0a0d0beb891d SHA512 96bfc3aa24c84eb7f386115fde6aa61d5f297a463761c6b7b37f1250e5968728b11f39d7549e4a13c1e494611fb41b1c2ebfb53299dd6c0b79f689f5f56e1a83
+MISC metadata.xml 526 BLAKE2B 19d0378d36d2b1d81ce404a95d98488b54f4368c72a7397b6d7c9a444edec9c19d146295cfc247a75aca1e1b5d1643161a627b80ea76aa8d43189a5eb14380c2 SHA512 7a8c8a7c05acdc110422d7c38552c8106d1886a672e6bda1212ce9cba737ae5e89e6624010d5bc3149b8da7c061b10295a721c74e7377587ec52ec7be2237855
diff --git a/games-emulation/ppsspp/files/ppsspp-CMakeLists-flags.patch b/games-emulation/ppsspp/files/ppsspp-CMakeLists-flags.patch
new file mode 100644
index 000000000000..cd07a6b35a63
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-CMakeLists-flags.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -336,11 +336,11 @@ if(NOT MSVC)
+ 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
+ 	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+ 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
+-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
++	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_NDEBUG")
+ 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
+ 	set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+ 	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
+-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
++	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_NDEBUG")
+ 
+ 	# Disable some warnings
+ 	add_definitions(-Wno-multichar)
diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index 4b2bbd782539..436d0327be4d 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -10,9 +10,6 @@
     <flag name="discord">
       Enable interfacing with a locally running Discord desktop client
     </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>
diff --git a/games-emulation/ppsspp/ppsspp-1.11.3-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.13.ebuild
index 0e56f4eb3423..30e0b99f6390 100644
--- a/games-emulation/ppsspp/ppsspp-1.11.3-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.13.ebuild
@@ -1,41 +1,41 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake desktop xdg
+inherit desktop xdg cmake
 
 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/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.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/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/hrydgard/miniupnp/archive/7e229ddd635933239583ab190d9b614bde018157.tar.gz -> ${P}-ext_miniupnp.tar.gz
+	https://github.com/facebook/zstd/archive/a488ba114ec17ea1054b9057c26a046fc122b3b6.tar.gz -> ${P}-ext_zstd.tar.gz
+	https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ${P}-ext_miniupnp.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/6bd5b4bc983917ea8402f73c726b46e36f3de0b4.tar.gz -> ${P}-assets_lang.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/0b28335acea4f429ae798c5e75232e54881bf164.tar.gz -> ${P}-ffmpeg.tar.gz )
-	discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
+	https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ${P}-assets_lang.tar.gz
+	discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
 "
 
-RESTRICT="test"
-LICENSE="GPL-2"
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="discord qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
+IUSE="discord qt5"
+RESTRICT="test"
 
 RDEPEND="
 	app-arch/snappy:=
 	dev-libs/libzip:=
 	dev-util/glslang:=
 	media-libs/glew:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick]
+	media-video/ffmpeg:0/56.58.58
 	sys-libs/zlib:=
 	virtual/opengl
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:0/56.58.58 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[-gles2-only]
@@ -43,14 +43,17 @@ RDEPEND="
 		dev-qt/qtopengl:5[-gles2-only]
 		dev-qt/qtwidgets:5[-gles2-only]
 	)
+	!qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-flags.patch )
+
 src_unpack() {
-	unpack "${P}.tar.gz"
+	unpack ${P}.tar.gz
 
 	cd "${S}" || die
-	local i list=(
+	local list=(
 		assets_lang
 		ext_SPIRV-Cross
 		ext_armips
@@ -58,28 +61,23 @@ src_unpack() {
 		ext_miniupnp
 		ext_native_tools_prebuilt
 		ext_rapidjson
+		ext_zstd
 	)
-	! use system-ffmpeg && list+=( ffmpeg )
 	use discord && list+=( ext_discord-rpc )
-	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
+	local i
+	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_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package sdl SDL2)
+		-DCMAKE_SKIP_RPATH=ON
 		-DHEADLESS=false
 		-DUSE_DISCORD=$(usex discord)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
+		-DUSE_SYSTEM_FFMPEG=ON
 		-DUSE_SYSTEM_LIBZIP=ON
 		-DUSE_SYSTEM_SNAPPY=ON
 		-DUSING_QT_UI=$(usex qt5)
@@ -88,23 +86,14 @@ src_configure() {
 }
 
 src_install() {
-	insinto /usr/share/"${PN}"
+	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"
+		doicon -s ${i} icons/hicolor/${i}x${i}/apps/${PN}.png
 	done
 
 	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
+	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))"
 }