gentoo auto-resync : 25:07:2023 - 05:42:52

7 files changed, 361 insertions, 9 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 239f5d3010f4..ba6311686e47 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 79e7b8282fe3..b1d0d374fa39 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -7,8 +7,10 @@ AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb0730600
 AUX pcsx2-1.7.4667-system-chdr.patch 239 BLAKE2B 7a761b2e800b0a5683f4c65f23730e02752502a0c1098422ffa37b0562a025cf8c533dfaa5bdd20811e0d643d32eeb8a5cc8028c7a02b146b37c7f22fdb511c4 SHA512 7d09e9707bd0d2d98b637f97b73afb83d3eb88a91e938215de5894b184ecdd3f0bb2c5486a03bc4b9767b4226c3e99fc0ac0a00797d03ac8850081dbe1a91211
 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
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B 539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a SHA512 af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
+DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2 SHA512 2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
@@ -16,5 +18,6 @@ DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57
 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.4624.ebuild 8162 BLAKE2B e8f234914b127a9d4f16fb12e0f805defc57fbd680120e457f88789ff2d6c9371f6b667669b259c89b66c280723008ab0c9824e37af9cd540936ea9bb7af781c SHA512 6c9125bd42e5dae7e6d5402cc320a28783e9d13d190589e182907459dd9d5a33f3d2cf0dff95be66620403211d4834694054ccded20db195d99afd4e39ceed83
-EBUILD pcsx2-9999.ebuild 8478 BLAKE2B 2cb9f063af27841ef6c4076cc43954ca5d96436c4b6c8b5df2668db5beda9b1d07831dedc48f274eb5c3c74da5dd2b50df5573919c0a7d7202dbd9c2e85a5e7f SHA512 fc5a1a107065e48968bf89c9e09bdbd973a2277641cf4051ecd7b572aa969b7df8b2b31114a62bf06b733870ccd2d63f9a2bc749ea7167e423e915f6d3a0a3de
+EBUILD pcsx2-1.7.4795.ebuild 8550 BLAKE2B 6457f6228de5fa086dc5863bf47809f1f38c693c3110a0b664c6f71d42218d8fc7837de3fa9ae9805db09eaac906852c340fbc7f003731a436f015023746d2fd SHA512 c7bf695675192244f9b099ed92d5cba6aa38dbe4243b0623b0f1c6d5d077dd994f9ff1909f578eca6fe7ec81b6b4f3d334bc8aa60149a9fbab8874aea2e20a62
+EBUILD pcsx2-9999.ebuild 8550 BLAKE2B 6457f6228de5fa086dc5863bf47809f1f38c693c3110a0b664c6f71d42218d8fc7837de3fa9ae9805db09eaac906852c340fbc7f003731a436f015023746d2fd SHA512 c7bf695675192244f9b099ed92d5cba6aa38dbe4243b0623b0f1c6d5d077dd994f9ff1909f578eca6fe7ec81b6b4f3d334bc8aa60149a9fbab8874aea2e20a62
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
new file mode 100644
index 000000000000..c4d11083ad45
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
@@ -0,0 +1,8 @@
+Continuation of https://github.com/PCSX2/pcsx2/commit/a59f95317a3fd
+--- a/pcsx2/GameDatabase.cpp
++++ b/pcsx2/GameDatabase.cpp
+@@ -1040,3 +1040,3 @@
+ 	const u32 index = static_cast<u32>(s_hash_database.size());
+-	for (const ryml::NodeRef& n : node["hashes"].children())
++	for (const auto& n : node["hashes"].children())
+ 	{
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
new file mode 100644
index 000000000000..7d24c2ae54cd
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+			-> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+			-> ${PN}-fmt-${HASH_FMT::10}.tar.gz
+		https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+			-> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+		vulkan? (
+			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+				-> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+				-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+		)
+	"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/rapidyaml:=
+	dev-libs/libaio
+	dev-libs/libchdr
+	dev-libs/libzip:=[zstd]
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	games-emulation/pcsx2_patches
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+FILECAPS=(
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${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
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=(
+			# libfmt is volatile and upstream is unlikely to make fixes for
+			# latest system copy punctually (may revisit this eventually)
+			3rdparty/fmt/fmt
+
+			# has no build system and is not really setup for unbundling
+			3rdparty/rcheevos/rcheevos
+
+			# system rapidyaml is still used, but this uses another part
+			# of the source directly (fast_float) and so allow the submodule
+			# https://github.com/PCSX2/pcsx2/commit/af646e449
+			3rdparty/rapidyaml/rapidyaml
+			3rdparty/rapidyaml/rapidyaml/extern/c4core
+			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
+
+			# glslang can be troublesome to unbundle (bug #831217),
+			# also keep vulkan-headers to stay in sync
+			$(usev vulkan '
+				3rdparty/glslang/glslang
+				3rdparty/vulkan-headers
+			')
+		)
+
+		git-r3_src_unpack
+	else
+		default
+
+		mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
+		mv fast_float-${HASH_FASTFLOAT} \
+			"${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
+
+		rmdir "${S}"/3rdparty/fmt/fmt || die
+		mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die
+
+		rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
+		mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
+
+		if use vulkan; then
+			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
+		-i pcsx2/Pcsx2Config.cpp || die
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+
+		# delete all 3rdparty/* except known-used ones in non-live
+		local keep=(
+			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
+			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
+			cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd
+			lzma rapidjson rapidyaml rcheevos simpleini soundtouch xbyak zydis
+			$(usev vulkan 'glslang vulkan-headers')
+		)
+		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		# (vulkan support tend to receive major changes, is more on WIP side)
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDBUS_API=$(usex dbus)
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DX11_API=yes # fails if X libs are missing even if disabled
+
+		# note that the current upstream is somewhat hostile to using system
+		# libs, system installs, or any modifications and may disregard any
+		# bugs that is not reproducible with the appimage using bundled libs
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now"
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
+
+		# not packaged due to bug #885471, but still disable for no automagic
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
+
+		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r "${BUILD_DIR}"/bin/resources
+
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+
+	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^^}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	local replacing=
+	if [[ ${REPLACING_VERSIONS##* } ]]; then
+		if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then
+			replacing=old
+		elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then
+			replacing=wx
+		else
+			replacing=any
+		fi
+	fi
+
+	if [[ ${replacing} == old ]]; then
+		elog
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, notably"
+		elog "it is now a 64bit build using Qt6. Just-in-case it is recommended to"
+		elog "backup your configs, save states, and memory cards before use."
+		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+
+	if [[ ${replacing} == @(|old) && ${PV} != 9999 ]]; then
+		elog
+		elog "${PN}-1.7.x is a development branch where .x increments every changes."
+		elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native"
+		elog "64bit builds). Given it may be a long time before there is a new stable,"
+		elog "Gentoo will carry and update 1.7.x roughly every months."
+		elog
+		elog "Please report an issue if feel a picked version needs to be updated ahead"
+		elog "of time or masked (notably for handling regressions)."
+	fi
+
+	if [[ ${replacing} == wx ]]; then
+		ewarn
+		ewarn "Note that wxGTK support been dropped upstream since >=${PN}-1.7.3773,"
+		ewarn "and so USE=qt6 is gone and Qt6 is now always used."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3af6a07551b2..7d24c2ae54cd 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -27,7 +27,8 @@ else
 				-> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
 			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 				-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		)"
+		)
+	"
 	KEYWORDS="-* ~amd64"
 fi
 
@@ -36,7 +37,8 @@ HOMEPAGE="https://pcsx2.net/"
 
 LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
-	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
 SLOT="0"
 IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
@@ -67,22 +69,26 @@ COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
 	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )"
+	wayland? ( dev-libs/wayland )
+"
 # patches is a optfeature but always pull given PCSX2 complaints if it
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	games-emulation/pcsx2_patches"
+	games-emulation/pcsx2_patches
+"
 DEPEND="
 	${COMMON_DEPEND}
 	x11-base/xorg-proto
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
 BDEPEND="
 	dev-qt/qttools:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
-	)"
+	)
+"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
@@ -95,6 +101,7 @@ PATCHES=(
 	"${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
 )
 
 src_unpack() {
@@ -118,7 +125,8 @@ src_unpack() {
 			# also keep vulkan-headers to stay in sync
 			$(usev vulkan '
 				3rdparty/glslang/glslang
-				3rdparty/vulkan-headers')
+				3rdparty/vulkan-headers
+			')
 		)
 
 		git-r3_src_unpack
@@ -158,7 +166,7 @@ src_prepare() {
 			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
 			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
 			cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd
-			lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis
+			lzma rapidjson rapidyaml rcheevos simpleini soundtouch xbyak zydis
 			$(usev vulkan 'glslang vulkan-headers')
 		)
 		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
diff --git a/games-emulation/pcsx2_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index 55778d6d1398..d478b4f18011 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,4 +1,6 @@
 DIST pcsx2_patches-0_p20230623.tar.gz 598611 BLAKE2B 5a2fb1b31f9448064d7ce46c11b1dadbf1960403c082c8cee5a4c897e9c7db334a70d1f088ad18893bad89e12ef4369e2a6cba3e493fe11846848180a755b0c4 SHA512 55b7221c8f5124a44f73aa552491d1ceac796e0c34179439ba2a599891691ece19ad35b16600fa3eea1031fdcf6f5f2ee2d9da9226656ade1413b83c983383a9
+DIST pcsx2_patches-0_p20230722.tar.gz 605026 BLAKE2B 47bc0d7676d50f5e1ec60cc473e9290070996e8159260a35a2aaabb771bc7341d248050cb5e13bb72d857709abf522f5c48a1b5a1b9f6ccbaae2c014c2511fbf SHA512 d31863829d47b77d23479e1c498990719cbfb1ddbf25786a0be9f2c2540b9c7f24f080815f4fc37ee710d4d0b75c4d9eb1dabc82564b0d092aeebab6010dc851
 EBUILD pcsx2_patches-0_p20230623.ebuild 1514 BLAKE2B 103b8e377498dc92c988ee84a6e297db60008dc5adca4c4e72ad7c3c226e8601a1c38249526e4bfb4c4af6bde8d064a00a6626d19491fd42d39ac6a1b9c667d7 SHA512 b684dd45d2bf2bfce36131a7a2b8289de3eed8f913972dca9781099afd37401adbda59cae7b5a88f9ef9dc7c720d0cec00fe5a5b824a6053de6081e58099f7ec
+EBUILD pcsx2_patches-0_p20230722.ebuild 1514 BLAKE2B 9a570a7def69ed0723aa17462b4a4869e673096535ea2c940ea1243de2eae81ce84e87f783ae34064feeb45ffe4453d0d87c450579e135d1d59e81cfc8b53d05 SHA512 99a3433881c58c8daf053b6ec98913763436bd2e512852088f9da6393d795f2b95354077b9302dfacc7b8b7c12161a1277012f7e0da2639e9fdf4fe286fc13ac
 EBUILD pcsx2_patches-9999.ebuild 1474 BLAKE2B f504882547fff78ed299bff906ebbfe28cd5831b052589f49d8dcf02f5dedf63b083f188e36255f7991cd3c15b748f177486f245af4ae73fcdc3c4b435735472 SHA512 ce3e4fdb3e1cca2efbbf40166d7de36db5a60a6876dbc7266e12640140e908f0c1f02ad0407b3fafd2562ac95d7e16e1020a61b9b1b5b358a10dd0ceb5fbd3d7
 MISC metadata.xml 362 BLAKE2B 3b213785f8a28bc1e2f540e27b025d4397dec5f7885fcc8f7e3fa56186b8f023ef97de5ff7b927a8c09ad1f79baee546d08b25cf865e344197a1640470f37641 SHA512 f00b1d14ba779989c235775de6f2470e18b29f2813723eae51015681af2d2c798aeddaa9657897c83b8bcb0b124ea77b34cf6370e37104fa24a968834ea5fabb
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20230722.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20230722.ebuild
new file mode 100644
index 000000000000..0bd2dd95b845
--- /dev/null
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20230722.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2_patches.git"
+else
+	HASH_PCSX2_PATCHES=0493be5016c74373465c9d3b67bbdcdd12adb100
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2_patches/archive/${HASH_PCSX2_PATCHES}.tar.gz
+			-> ${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)"
+HOMEPAGE="https://github.com/PCSX2/pcsx2_patches/"
+
+# these are normally distributed by upstream with PCSX2 which is GPL-3+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="${PYTHON_DEPS}"
+
+src_compile() {
+	# upstream uses a constantly replaced "latest" patches.zip (currently no
+	# real releases), and github's .zip archives cannot be used either due to
+	# having the patches/ subdirectory -- so we use a snapshot and repack
+	# (could use app-arch/zip, but python is more likely to skip a dependency)
+	ebegin "Creating patches.zip"
+	"${PYTHON}" - <<-EOF
+		import pathlib
+		from zipfile import ZipFile, ZIP_DEFLATED
+
+		patches = pathlib.Path("patches/")
+
+		with ZipFile("patches.zip", "w", ZIP_DEFLATED, compresslevel=9) as archive:
+		    for file in patches.iterdir():
+		        archive.write(file, arcname=file.name)
+	EOF
+	eend ${?} || die
+}
+
+src_install() {
+	insinto /usr/share/pcsx2/resources
+	doins patches.zip
+
+	einstalldocs
+}