gentoo resync : 12.05.2022

6 files changed, 11 insertions, 10 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index fd6db13eb21e..0a83c1aff205 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index b50930376962..78cefd74f64c 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
-EBUILD dolphin-5.0_p20210506-r3.ebuild 4472 BLAKE2B 0f0aca8dc6006577c4a3502c5eafad8a2b53ffc3db9eb0e075f1ecc94d57fa1c449c9873daeceb64dacf4cda0b89a441d958a410b53bc074c83e85c1fc11bdf5 SHA512 a6a2693218edcdc36d3d984237e51984e648d71d850390b52cd8c903c2edab5c7bb9fa11b375adfa16ce60fdc6475d729d56b20f52f213bb19182fbded5788be
-EBUILD dolphin-9999.ebuild 4581 BLAKE2B 0916ddcb96434f5bc1d024c02c50d736b43ef1ff705a4d812d56fa50b081b16da818d4dcdfe3aaaa21a5d3b5e502e7435dace176c1e6d62870a62253cc606ffd SHA512 3a950ba0209df836b60524e87744fb948eebdf842ccf74ce672773a5876a50ab061b7c1a2aacaa919a6bb79b892b990061f1a376958b20111992695c4a7def83
+EBUILD dolphin-5.0_p20210506-r3.ebuild 4464 BLAKE2B 55c1c06f54b6f1b0cb97d17bfc79e88fe639f0a11c4d6c67e77b51576b4cab883a9f64410805ebb99ffdcb70b75bad1e0abfe9b621f3e10e46202b194873d153 SHA512 2078b5dd79e4828ef4685351cd5764ca0dfdceec6c3db11405d1636e1385d8536b1bd06f5a571f8f460304c398164c458e52994f3a31f6e741bd726aca130aa3
+EBUILD dolphin-9999.ebuild 4581 BLAKE2B d4f3db6f02d525e954df6d0e702794561388164333b3a8fe1ff87b20055b41e5d85908769cf2e2d9f8c9b470525636cf64b426bba6d764c4d4e58bfd828d06f9 SHA512 541ceff0c46f76d6de91dbbf2e83be76dbc729fa65debe2a2c7980687d6a5e60de1e225b9380ea21d0bad17d7f4bb1d587201fc9d5e9df9c64f4692d6e58e421
 MISC metadata.xml 1014 BLAKE2B dd84038010d16d37449491e1df7236b95a7dc30097264a9f9d1a542b59feffe3b1e6a6dba318fe856eaac7b7470a1c316c5378dabcccd8ef6f7f101f5ee683c5 SHA512 87b4cb7475697d7fad526c3dcae604aa9d4f8facf68b0bcdbb1c931a839c998a34977acdd1aec9cacfa7f9a8b7d3f9e33d6f1253a0f1899fa2e3439f1ebc08a6
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index ec22c67307fc..33218b7db9b5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -21,8 +21,7 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/"
 
-# NB: appended below
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
 	profile pulseaudio systemd upnp vulkan"
@@ -108,7 +107,6 @@ declare -A KEEP_BUNDLED=(
 	# No code to detect shared library.
 	[zstd]=BSD
 )
-LICENSE+=" ${KEEP_BUNDLED[*]}"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index a6b3ce256bbc..c62f0305347a 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -22,8 +22,7 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/"
 
-# NB: appended below
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
 	profile pulseaudio systemd upnp vulkan"
@@ -110,7 +109,6 @@ declare -A KEEP_BUNDLED=(
 	# This is a stripped-down mGBA for integrated GBA support
 	[mGBA]=MPL-2.0
 )
-LICENSE+=" ${KEEP_BUNDLED[*]}"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 9a14c95b102e..86a8ca80e510 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -2,5 +2,5 @@ AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa0
 AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869f6c125dcdf171bb67b9392921d7a006f4b96075086b3927ecede027ff0b2efa40982b10e121c2e1096e36fcbe8bc SHA512 14f0eddbd9c72600f47733a5137c171abf05723b55aedf37438ed89730a9684b67a20d79dea3864531521421c1436922a19667353d7e51253ad3449a99b7b21a
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 EBUILD pcsx2-1.6.0-r3.ebuild 2756 BLAKE2B b62ba422f2856bc9b6a6f0e3961495e8cd88ce67a80228dfde200d9f62b71e41fef52836a5d80ceb2bdf4a11323935d37a566127387437abb133c361ff3c5dfe SHA512 892d63d5b60495ffd2459cec294e50eff2b9b83fe153d650f809a539bc4521e80fad64d229fe6af05ff21faad3e57a10d06b10f6053d42c254102da0f8036fed
-EBUILD pcsx2-9999.ebuild 2867 BLAKE2B 2e6eafc0c9b9c747e48ad745b4b186bd27927ccb8db4a3c80b7c9cfe7e5f8ee08bdba372af3460f205eeab8e113d162861d722dcacb8aacc3c65a4503189edf1 SHA512 75c9fc8a4a385cfabf30d34aa889da186d2d06ff410ee32e18eb52797ca07e95e94d5429214f881366583aaeed8ea614482d730241f2ed1baa3821f81665e61f
+EBUILD pcsx2-9999.ebuild 3071 BLAKE2B 1ae32681db094aa92dfd357165cbcca54468cb06245abb552cc63e8d8a498d1719bbba99eb7c653a8e139b38a9c29dcdb787bd22b24b5ba37a4bf9db2d56ca2f SHA512 b25200c43d214020715b9b117ed9d43bb5ec83a8f13f3e56cf86383bc38cf7fafb83ed4850d753ad3da9b13b0a9361dfbd0f899eb8b3091bb66f29b81582301c
 MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index bdd694c0a1c5..8c462bcb79c6 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
+	dev-libs/libzip:=[zstd]
 	media-libs/alsa-lib
 	media-libs/cubeb
 	media-libs/freetype
@@ -73,8 +74,11 @@ src_prepare() {
 	cmake_src_prepare
 
 	# unbundle, use sed over patch for less chances to break -9999
+	# (zstd is only used by libzip, so can remove entirely)
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
 		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
+		-e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \
+		-e '/add_subdir.*zstd/d' \
 		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
 	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
@@ -99,7 +103,8 @@ src_configure() {
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS=$(usex test)
 		-DPACKAGE_MODE=TRUE
-		-DSDL2_API=TRUE # uses SDL2 either way but option is needed if wxGTK[sdl]
+		-DQT_BUILD=FALSE # TODO
+		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
 		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
 		-DXDG_STD=TRUE