gentoo auto-resync : 22:04:2024 - 12:05:36

9 files changed, 19 insertions, 237 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 55024925b6b4..dd1c14e60474 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 0ca6132e8ce9..9ee9985fc5f8 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,11 +1,9 @@
 AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83
 AUX pcsx2-1.7.5232-cubeb-automagic.patch 774 BLAKE2B a932e49643df613710c27c8f0881c6e2b9c2d90964ff7f88b48b3ec5ad281bbd152fbede638accc054ea5935401ef240ed0bf8107fe1c10997242ea546b93699 SHA512 5985f08a2acce8ccbe946a7c5bd85b2388ad7166b0243a7e698c96990a3856660c1f353bc74a9ced0e5ff08f10e27922e05eb77fabff1e797166b7d6a4c445a7
 AUX pcsx2-1.7.5700-vanilla-shaderc.patch 751 BLAKE2B d7dde7c368c2231b2876d1e42ae1306f413bcc795a15514e3cbe15bedccc667a60d9ac09b8559ee48513fb144732937bc69e5d722523fb6a3353adebd7ae8464 SHA512 975d490772a7552f748afbc37fddb7acbd3b33e58799b0b4527b24b6d7335436739e8c544a1eee4c73240029a5bd691e318e953c1d9a33e0630061d69a038837
-DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B 2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d SHA512 261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
-DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
 DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
-EBUILD pcsx2-1.7.5474.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
-EBUILD pcsx2-1.7.5560.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
+DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d
 EBUILD pcsx2-1.7.5624.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
-EBUILD pcsx2-9999.ebuild 4460 BLAKE2B 11423586880808e8eff1b34b2b2eabf7100dff87951997e617223f78b45a422ad947b99f7eededa23aeb323849ae06f1b8f2444e6b23a0c49110e63c28e42b0f SHA512 c85ae02a5f6739b670d33c59b1ffefd4b5c2011306297a47b46bfd7a29d5f2288334e278ad9acc735defea32bdc544a5d067791a61ec1bf4cc89c9b164e80cd6
+EBUILD pcsx2-1.7.5724.ebuild 4470 BLAKE2B f14c2fd9688a4c5a7482e2bd111d33b8372d678c359571381b1eb9a44ec21fe74969a2a3df67b9a37ae2ff0c308d4357247ef888e7f158e93217492c9da26adb SHA512 34e07359846e6dd436b1b0577a66f3c777ec1b5bbc11bfcb2d3afe45a08c1af5de2e010138aebff3bd6a7e0f6e631e7c1d7275ff68cfc630f5499046addaf896
+EBUILD pcsx2-9999.ebuild 4470 BLAKE2B f14c2fd9688a4c5a7482e2bd111d33b8372d678c359571381b1eb9a44ec21fe74969a2a3df67b9a37ae2ff0c308d4357247ef888e7f158e93217492c9da26adb SHA512 34e07359846e6dd436b1b0577a66f3c777ec1b5bbc11bfcb2d3afe45a08c1af5de2e010138aebff3bd6a7e0f6e631e7c1d7275ff68cfc630f5499046addaf896
 MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
deleted file mode 100644
index b53145e648db..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	# unbundling on this package has become unmaintainable and, rather than
-	# handle submodules separately, using a tarball that includes them
-	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	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 +clang 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/lz4:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-qt/qtbase:6[concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	media-libs/libpng:=
-	media-libs/libsdl2[haptic,joystick]
-	media-libs/libwebp:=
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	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-0_p20230917
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	clang? ( sys-devel/clang:* )
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-	fi
-
-	# relax Qt6 and SDL2 version requirements which often get restricted
-	# without a specific need, please report a bug to Gentoo (not upstream)
-	# if a still-available older version is really causing issues
-	sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
-		-i cmake/SearchForStuff.cmake || die
-}
-
-src_configure() {
-	# note that upstream only supports clang and ignores gcc issues, e.g.
-	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
-	# (CMakeLists.txt also gives a big warning if compiler is not clang)
-	if use clang && ! tc-is-clang; then
-		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# for bundled old glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-DENABLE_TESTS=$(usex test)
-		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no
-		-DUSE_VULKAN=$(usex vulkan)
-		-DWAYLAND_API=$(usex wayland)
-		-DX11_API=yes # X libs are currently hard-required either way
-
-		# 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() {
-	insinto /usr/lib/${PN}
-	doins -r "${BUILD_DIR}"/bin/.
-
-	fperms +x /usr/lib/${PN}/pcsx2-qt
-	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
-
-	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^^}
-
-	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
-	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
-}
-
-pkg_postinst() {
-	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
-
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
-		elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
-		elog "to backup configs, save states, and memory cards before using."
-		elog
-		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
-	fi
-}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
index b53145e648db..5c49263139b5 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* amd64"
+	KEYWORDS="-* ~amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"
@@ -27,15 +27,16 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang 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
+# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
 	app-arch/lz4:=
-	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
 	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
+	media-libs/freetype
 	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=
@@ -50,7 +51,10 @@ COMMON_DEPEND="
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
 	wayland? ( dev-libs/wayland )
 "
 # patches is a optfeature but always pull given PCSX2 complaints if it
@@ -75,6 +79,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
 )
 
 src_prepare() {
@@ -101,9 +106,6 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
-	# for bundled old glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index b1a0cb87549d..5c49263139b5 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang 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
+# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
 	app-arch/lz4:=
 	app-arch/zstd:=
diff --git a/games-emulation/pcsx2_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index b829994d39a0..0a094063fb68 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,8 +1,6 @@
-DIST pcsx2_patches-0_p20231217.tar.gz 647767 BLAKE2B a82211d3a31ee3475d2047ad4c25cc247003b15f8132c0e0fa1c144fff3ea59f0806409aeb9a1128697aee2453110d2da50e9577067d068879a885477b04dc3a SHA512 411431fa80a0a221c7b336ebb84ce9b0c078ff75c2cc79b5e31c9b5fc505f9ecec8b371c142a6be6802e2070ae57758c65df34d24d5392fb9f4065a276b32610
-DIST pcsx2_patches-0_p20240116.tar.gz 657224 BLAKE2B 9a85ed98565fa002176b86675c60b016688959228b9055c7e577aea235d15a9aa64d09e4af7c997670dec075a3c3b790d19661342d2f5978ca49adc9da33625a SHA512 c35281bb92d562e279fe81c2584d8341b407a3bd72467825c4ac454a698cd844b905dd4533144c7837e22b1fb7971be525fc5dcd8f0ec09e5f1d66630f7c2692
 DIST pcsx2_patches-0_p20240312.tar.gz 664671 BLAKE2B 3061297d147db103a24c7c20c81723fd0f602ec22b38ab12624816c812431ca7440d8dea15ada71e18fc3da480ddcee50a19bf2186274640f3f3dc264795b0b7 SHA512 400cde1c18e7bb2472ddecf96ae918830cbdc6d61fb12f392d0aeda6219f75cf597440c96c6ae1defaea4e2298925833548a473d3c7000f22e20dedbe0f401b7
-EBUILD pcsx2_patches-0_p20231217.ebuild 1518 BLAKE2B 4c66d2f2e340000ef50f63c3eb50ac851a93963e776091e06654b845791168f0060fce54d7aaeb7017247adbc584f474f84a45d9d27dc421eaf6b3de9b6ef147 SHA512 68dd144f8344660840dfceaa4ea2d5cd3a1212ea324d97ba0105ced2b4fb71a8df3dd5742a4352c4326ec6ef321af0bf0fd9e29d6fbdd29134ee6f0ef65ccbdd
-EBUILD pcsx2_patches-0_p20240116.ebuild 1518 BLAKE2B 94252971bba79d536ac7a87ece1ab3ff4523d5a99089679c274ac5a53b1b724c8601a3ebab395bb4f70304a74625c86416d25b8f7383eabebf11853ba82118a1 SHA512 bc468995b366c992d110f4568e30c98d2e555949de2f73ba4020faf1e018dbe39aafa12c4358e0886a73cffc9fba7708a8e15c11a2932ec81a53dc179178cfe9
-EBUILD pcsx2_patches-0_p20240312.ebuild 1519 BLAKE2B eeabfc5e65122164c2ca531be34615bef21d49cbfb6b71be0b3864f772f27ffc7d4ef5441ff1ecddc8aa6e51ff298a3dfb7c33438759af022990303173ce6237 SHA512 25acb4ab3f469deb3176c08266e8f3c7d5de5dfb36a321db54e10f821c77a8a45ed0f4731e4a07c84dc8842f2371e2e198865ff033edf3f01cc4d73789c029bc
+DIST pcsx2_patches-0_p20240416.tar.gz 670438 BLAKE2B e3d9692f89e8b141c816fb433980afc3846c48579b89f2310b9368767c943e74664a880c889dd35f9820db492b2d47ab7828fdd8604d034b941156c10edf4290 SHA512 63c52416c78b35a964427d587967cb709657ff914ab9fb0670b6cf67582ee765e8401e5ada747cdd2486b11ecf8a99e3054335ebb0f0d95b1fea926a2a55ec7e
+EBUILD pcsx2_patches-0_p20240312.ebuild 1518 BLAKE2B 84d6d9a39a1aba38049f98ba155098d69a67c3e42a85e092a737ec26fe3613bafe3e147d113cc37274f3abb975d6642c0dab4bfd2f50d5ed6024c9826a00d1e5 SHA512 e4945006f4360c9e3afecd0fa2102b3d84b7cd98f719b9abff2ae3f047cdc9cef788c97e8eae21b790f27567cb2bfb615efe41f7c49ae904551ed4b63af5b2a1
+EBUILD pcsx2_patches-0_p20240416.ebuild 1519 BLAKE2B 04e7343f0cce7535f6292e76e5baf78f85148ac7886b0503f4f414a31831e1b141be280a0165197a9d8c1db8ee7dd26c2159a0d12de6d2e80ef7290e957fe6f2 SHA512 7d36ad82820502ff156017b94b2f3a2c88c402da1a920e3763a2c828750bd37a68a0c0db64be8ba449104d0036d85ce4dcc48ef44b92eaea47b45f47faca9759
 EBUILD pcsx2_patches-9999.ebuild 1474 BLAKE2B b93d9a65771de4e9699a31e4a8d0b1cefc57a9851fdcb07d711d1aa79ea3b9e8f8b1bfa17d5d1b000be19be72a8ece7d72981bd2dfb06409cefec8ca878a374a SHA512 191e544e1100c701906a01b711c3111d743b3a4a68805a5c22d86fdab5d50e49bb04182ba7933c0e1f555ba50a9c09c4eba7480396adb1547b1bbc893b011a8b
 MISC metadata.xml 362 BLAKE2B 3b213785f8a28bc1e2f540e27b025d4397dec5f7885fcc8f7e3fa56186b8f023ef97de5ff7b927a8c09ad1f79baee546d08b25cf865e344197a1640470f37641 SHA512 f00b1d14ba779989c235775de6f2470e18b29f2813723eae51015681af2d2c798aeddaa9657897c83b8bcb0b124ea77b34cf6370e37104fa24a968834ea5fabb
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild
deleted file mode 100644
index adad6bafa8ff..000000000000
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2023-2024 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=619e75bb8db50325b44863f2ccf3c39470c3d5a3
-	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/lib/pcsx2/resources
-	doins patches.zip
-
-	einstalldocs
-}
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240312.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240312.ebuild
index 305c741d6a4a..2387463ed6d0 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240312.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240312.ebuild
@@ -16,7 +16,7 @@ else
 			-> ${P}.tar.gz
 	"
 	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)"
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231217.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240416.ebuild
index 23effcddc10f..198c47008fcd 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231217.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240416.ebuild
@@ -10,13 +10,13 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2_patches.git"
 else
-	HASH_PCSX2_PATCHES=42d7ee72b66955e3bbd2caaeaa855f605b463722
+	HASH_PCSX2_PATCHES=0f52d8a5eb1cefea8b416532ce6ba225271e267f
 	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"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)"