gentoo auto-resync : 25:08:2023 - 09:53:56

3 files changed, 11 insertions, 2 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 86bf65d2d693..2d47ed97d47f 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -7,6 +7,7 @@ AUX pcsx2-1.7.4667-system-chdr.patch 239 BLAKE2B 7a761b2e800b0a5683f4c65f23730e0
 AUX pcsx2-1.7.4667-system-gtest.patch 504 BLAKE2B 23a15c765151fb25e54b5dfb4c948eea7b5258ae5cbcb68f214128301902c900b2e1882ae66b9a6a0838cc18eabe5c7889be29d396f6f6ba5b71e33f7cca17e4 SHA512 2571ed120173cbcd912e0d3f12afc79716c8ba791cc292b5b7f3ee133c040eed2769079a4f372b5eaa501d640498bb3781142af97447d055eac5ce10995fddf3
 AUX pcsx2-1.7.4667-system-zstd.patch 528 BLAKE2B 5539f8de26ee029d95199f3da1e5eea7f1b8a226b01ee53df8aa6ed3d514bb66e8c7ab5a4a44d8fccf4e7eb0dea058028db1c9509a0d9c67f48224d3385d4a9a SHA512 c3eb6e32c3b7b4384e438597d6bf3bae49309c0b9c7b38374edadbde2f6430c5583b2bec07daf14c8c71efa8b848af5ebe0e55f1df84f37ff98b854062644cec
 AUX pcsx2-1.7.4795-rapidyaml-0.5.patch 323 BLAKE2B 1ddc927ea824793997d0fb371caa8da1db2315c0ba7205e88cc3fb405a29e00025e074a447da381ad93924f3e85f4565534d2e7b957cb43a3d9cf1b2e41a51fd SHA512 04de3ca3ee0a69c283e6a59420dd67aa77fea083607366bac7cab7ea4be1cb6207dd3d78e3179c7de6e802c8607b275d64ec4ca3f57037e27745c732a1e231d4
+AUX pcsx2-1.7.4943-system-libzip-zstd.patch 320 BLAKE2B 4accb1436f8df4198d53a74fb73cbc3389f3fa1ef05849b025c599d7700b657eef02a449b6138fd3223bc53a8df0ec0cbd5a3fa29b0bf6bb2a5612087461036f SHA512 01d996636cc89fee44e30420347b176d50905b9b441dec1c4562a98063f93e9816d855b795388d93db3193e27b91a725554eb6a01ecf24b9a20613f7a3d1efc2
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2 SHA512 2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
 DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
@@ -19,5 +20,5 @@ DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd7
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-1.7.4795.ebuild 8550 BLAKE2B 6457f6228de5fa086dc5863bf47809f1f38c693c3110a0b664c6f71d42218d8fc7837de3fa9ae9805db09eaac906852c340fbc7f003731a436f015023746d2fd SHA512 c7bf695675192244f9b099ed92d5cba6aa38dbe4243b0623b0f1c6d5d077dd994f9ff1909f578eca6fe7ec81b6b4f3d334bc8aa60149a9fbab8874aea2e20a62
 EBUILD pcsx2-1.7.4940.ebuild 8550 BLAKE2B 759f089819ba78b833e8be2c2a6352fe58ed49f130c3141d26b995c89d8bac3d1af646829ca253265620541934a6dc812a96890252649c3d3362741744f666f3 SHA512 783d8db763ec1d6d960e60788aca11f2abe6ae4d12ff272edbb3e1f47e481fbb845a0d1e5435c67fe0466e70c88f8e3d284cd0cc62bb47f72dd7e5efd618bf0f
-EBUILD pcsx2-9999.ebuild 8550 BLAKE2B 6457f6228de5fa086dc5863bf47809f1f38c693c3110a0b664c6f71d42218d8fc7837de3fa9ae9805db09eaac906852c340fbc7f003731a436f015023746d2fd SHA512 c7bf695675192244f9b099ed92d5cba6aa38dbe4243b0623b0f1c6d5d077dd994f9ff1909f578eca6fe7ec81b6b4f3d334bc8aa60149a9fbab8874aea2e20a62
+EBUILD pcsx2-9999.ebuild 8557 BLAKE2B 7fab54a57f9ed9b32554251568124c012db0a8cc08f6b8c04321df6c08add0e48ef56c3a8f6e56d04241c4d8f5182609d33af5b57468da69b34efc978e8fb982 SHA512 e917ae0e004923e2b16e0c80b58ce6acc97f568c42d95638df6ed6362b505b12f9dec2cf79ede31e358dd6726979fc9a015fddf66bb003f832b9d658734fcae7
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
new file mode 100644
index 000000000000..631e49b3bddf
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
@@ -0,0 +1,8 @@
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -181,2 +181,3 @@
+-add_subdirectory(3rdparty/zstd EXCLUDE_FROM_ALL)
+-add_subdirectory(3rdparty/libzip EXCLUDE_FROM_ALL)
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
++find_package(libzip REQUIRED)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7d24c2ae54cd..f41481a3cf53 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -100,8 +100,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
 	"${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
-	"${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch
 	"${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
+	"${FILESDIR}"/${PN}-1.7.4943-system-libzip-zstd.patch
 )
 
 src_unpack() {