gentoo auto-resync : 01:10:2022 - 19:11:24

4 files changed, 43 insertions, 4 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 4ad1e3768742..10bffd769564 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c1d657f6097f..e66a7f1310dc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -6,11 +6,12 @@ AUX pcsx2-1.7.3329-musl.patch 292 BLAKE2B 02717d90a08caddc6c0df32137fc73fc4426f9
 AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fbccdddadd3d5941057f163c064a1e3d81daff1a90c689fe1d4bb1e645081be9dae2aa63a88caa9b2b83b13cebf SHA512 65f3f241ccda684cee1d382a973ffbda09b290a4878f7c0b3aed279b2fa5aa1f188b7a5bf26a584d2aa4ed12aa9c1c5e15ecebb2c2bb6ae83a7622deba26bdd4
 AUX pcsx2-1.7.3329-unbundle.patch 1493 BLAKE2B 9d37c36773d594bfc045ecf50680a422e597c96ce76e934a4ed7cc91c6ee2a1f3bb162eeb04a4437fbd5be1e064dff295702b4bcb1352a0064ba7fa697114175 SHA512 b142b2fa1aaf68437f47bd33d30e474543fea05794c67321b3b19746d95ceb7f02196ff8518bb2cc85fd52d43a4233955a31842edf38e9560e3f32204d2fd9d4
 AUX pcsx2-1.7.3329-wx-vs-sdl.patch 350 BLAKE2B 17e54fd9150ad7d8d3545e474b5579ae8b8e1df1b38b510931dee73e566903b6f9397d2dec537f6d6425d61a966f71169f84a863c0e0a82203ce21ab3f514fef SHA512 9240e808886b746d74828405a931c6dc4d093f3ab22619b2a5d349f737a241c2b7545771931a4b77385d6cb6583124a01ba24faf74f43914fdc62c6f33dd39b1
+AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-1.7.3329.ebuild 5684 BLAKE2B af44f3fe3968440f88f2506f4e23d1361f2ab5a556d0095b55dc9fe883ab1fe75de5736c22b6e5855c1d49a4e0c2eb783666b0c21f825cecc0381aecdc0d51f1 SHA512 af6169cfa2f69125abce4d08a9bcf5c1919611fdda8a00ffcf66f61bcf06f4c3dc531bdfb5042d4b605eccac11214e1904aba8626b1987b3a69ab71807ff9ac1
-EBUILD pcsx2-9999.ebuild 6001 BLAKE2B 7a4eda83b66c7223ab37c422117588931010fef3a3a991fc10f82062d362a247730755905c7baca53c65dd98feff60bad89570c895f3fa76d01d97656881d6cd SHA512 bbd8b8f6f5eb6b74164d8f63c6b1dd6f566f33b4428612d28d21dbdea49d4be153a4b80681bea328ed3ea90cc9645180225e7d03c1682df033e3a53dd4d877a9
+EBUILD pcsx2-9999.ebuild 6225 BLAKE2B feb25a57371ba03458e965b83f3c07d11d497ab483cdd2987d76774b14a3ad101a596362a3ce76764bee5621679d5bfcf2bb991ebfcdc23333d35d8eba6a44ee SHA512 8258ef5a25bc3328892b085a08eef7bc554e39880924b78dcf7544dd27996e22e0eedbcb879905dafd680e3044b51a39cc43d03c6fc31036e210b086482e4f97
 MISC metadata.xml 797 BLAKE2B 9536213247a29ac842e44a2ddef336ae0799c4acc8733823949eabda4f1d3bfb4c793141b99031c6889e346ff97d3b42c7b4c8139cb7494e2364fa58717eaa26 SHA512 ee72fc85420b247cc9db5f25d650532311a21490b8dcd4b5b048614bd0e03716c821b3f6586a21fccc0d9e14d0af6e8de774375703e7e34d5c2efe04096615f4
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
new file mode 100644
index 000000000000..014548ae9882
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
@@ -0,0 +1,34 @@
+Adjust to unbundle a few extras.
+
+zstd changes only needed because of https://bugs.gentoo.org/872254
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,3 +54,4 @@
+ 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-	add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL)
++	find_package(GTest REQUIRED)
++	alias_library(gtest_main GTest::gtest_main)
+ 	add_subdirectory(tests/ctest)
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -177,3 +177,3 @@
+ set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
+-if(ENABLE_TESTS)
++if(0)
+ 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
+@@ -210,7 +210,4 @@
+ find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
+-find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
+-if (${zstd_TYPE} STREQUAL System)
+-	alias_library(Zstd::Zstd zstd::libzstd_shared)
+-	alias_library(pcsx2-zstd zstd::libzstd_shared)
+-endif()
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
+ find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
+@@ -248,3 +245,4 @@
+ add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL)
+-add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
++pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
++alias_library(chdr-static PkgConfig::chdr)
+ 
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f84ec7bab70e..36b8e5ccf0b7 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -25,9 +25,10 @@ DESCRIPTION="PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 
 LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ ISC LGPL-2.1+
 	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
+# TODO: proper IUSE to handle cubeb backends with the now-required bundled copy
 IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
@@ -40,7 +41,6 @@ RDEPEND="
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libzip:=[zstd]
-	media-libs/cubeb
 	media-libs/harfbuzz
 	media-libs/libglvnd
 	media-libs/libpng:=
@@ -84,8 +84,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
 	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
 	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
-	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
+	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 )
 
 src_unpack() {
@@ -102,6 +102,10 @@ src_unpack() {
 				3rdparty/rapidyaml/rapidyaml
 				3rdparty/rapidyaml/rapidyaml/extern/c4core
 				3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
+
+				# TODO?: check if easy to unbundle when look at next nightly bump
+				# (there is a -DUSE_ACHIVEMENTS to be optional too)
+				3rdparty/rcheevos/rcheevos
 			)
 		fi
 		git-r3_src_unpack