gentoo auto-resync : 08:01:2024 - 18:59:30

9 files changed, 63 insertions, 305 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c03de7eac893..d3a5529c0f02 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index cd8c737362f0..a878ce400bf9 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,6 +1,7 @@
 AUX mgba-0.10.0-optional-updater.patch 206 BLAKE2B 199a4305212e1974aa79ee728ab7b685b4b52602fe6447dd1b29513b526e101a306558b9a912bbb3c1438ea6a70df1c9e6368e2ca2ba5b50e6a59200b2a11daf SHA512 3227908dca7a2973ae5c7ec311b683362adf16ae5d5c801943322962d181ad046f43383bdf86441d81284f4f567a8d8ae387f4c15bf25b3d4189882fecd79d6b
 DIST mgba-0.10.2.tar.gz 14323388 BLAKE2B fb2e652b76871c9a9ffdbf049965ca4a62ee8fed48b547a4e7d514587535f172a7e3b21ec138b8660707a2fbdc19268985191d10eb268e7ed0f059c5a8c81216 SHA512 4063cde6dee9cc07025fa997e401ddd4b28240a9e53cee571ef8aec65cb6cf56b821f0020af1cf00d4f97353efbd4dc39ccd55bc6a3bdf0448ee34736bfd6499
+DIST mgba-0.10.3.tar.gz 14350721 BLAKE2B 2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656 SHA512 de92725a18f00ec8645a75cf434a667bfc5aba954d0ae8be188241371a4a310214123be2cec13d20dbff4f660b401364efb51c43c7bdc24eea40454949062a52
 EBUILD mgba-0.10.2-r1.ebuild 2681 BLAKE2B a5274754fdecd3207c53e92de2e67856b2b2ca3d947525e078b6f906080a9a7ef58b73a5b014bb889ca18894ac6f846c877f6ce716a771a0cbbe9f538930769e SHA512 ed24c9b812a39bb9455ecd89340d04ef2ec15cfe21a62c868d13e32f6eebbaa774894fbcf275fa3d8936d6f80801e53d1e14c18d6ffdc29a8c3ace4b7d76a8c2
-EBUILD mgba-0.10.2.ebuild 2652 BLAKE2B a0a461c8e35bd12f60908f7e4d92306f3a9a43733f4958e3b4528034ac1c700d3222755424c78ec33050700bc0a2fbddcfe15824425a69f88cb1f8d13689b7dd SHA512 5d0859ed7e562a6e0216260aa4dab99ddd86c7b677fc0c79ed2c50e984e3823b763be0fbfff3cad2ae96fbdbd0385c0968c55ca927acdb46dce2a76d506ce435
-EBUILD mgba-9999.ebuild 2684 BLAKE2B d74b9d31d7b186c189dea907e7c8e46e3c0d87e929a6c8d2e0568476a4fdfcf9b89a579234bfb57de1939c09c42178ad65d6d96b1999ae02ec907de7fa793125 SHA512 c22de781bd85f0dca03ffb2c0bcdc64d46eb0a0fe4b2b74b36d39fd71e6a6832e15ae030a37719d1c63c167279595a4ab6d56eeb0ea0d267d17a974facf673f5
+EBUILD mgba-0.10.3.ebuild 2694 BLAKE2B f4b9c464ee57e52b8822a98b9c94c84a96f929380e4aaa82411f9438d1617453021c2b0ec88d7c21ec7711a0517377821e60d676b9c09c76f4b5371f22f72b75 SHA512 961a6f0d1b391c67fd894327926a84794182d98e2d12bc6606d0338d87705983ca1dd1c5275d161b1c172ceb49c4c998309a60e166566adaaab3cb4715dcb082
+EBUILD mgba-9999.ebuild 3064 BLAKE2B ce8bc60d0faf921d83c33548a8c7979cf32a68e12c7686631b447428f787072c926a5da7a48dacacc3bb804dc81dd9c58efb3a6aa97c7b4c6ffe20b37ef6b9f7 SHA512 9c0cb0bece9efec9f0df2ffbe8bc99f61f16321a54edb84f803084d2d8f4ee20d0e14ee43c2a1bf5909a7632a0051fe1c4df280e729b14e294481fef48996b5e
 MISC metadata.xml 623 BLAKE2B 888308191968b294352854c1228bcf82b25a3836fa53e1bf961e264c9a4f91c6e10f5598d4ba9a13927413f10a0686dfe180cd21e26e04c4c7c694f140dce9ff SHA512 93078c5ce55d268ebbed1789d80c8c5d9ef291fd1f48f2e4e1d124d3f4fb446bc7ec28fb6f20f4e79eecff64f2ff601408ef97555a5a9b55052312fb69c0e1fb
diff --git a/games-emulation/mgba/mgba-0.10.2.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild
index 1faa65354ce9..ccd1355085e6 100644
--- a/games-emulation/mgba/mgba-0.10.2.ebuild
+++ b/games-emulation/mgba/mgba-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
 else
 	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Game Boy Advance Emulator"
@@ -19,10 +19,14 @@ HOMEPAGE="https://mgba.io/"
 
 LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro lua +opengl +sdl +sqlite test"
+IUSE="
+	debug discord elf ffmpeg gles2 gles3 gui libretro
+	lua +opengl +sdl +sqlite test
+"
 REQUIRED_USE="
 	gui? ( || ( gles2 gles3 opengl ) sqlite )
-	lua? ( ${LUA_REQUIRED_USE} )"
+	lua? ( ${LUA_REQUIRED_USE} )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -43,13 +47,16 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )"
+	sqlite? ( dev-db/sqlite:3 )
+"
 DEPEND="
 	${RDEPEND}
-	test? ( dev-util/cmocka )"
+	test? ( dev-util/cmocka )
+"
 BDEPEND="
 	gui? ( dev-qt/linguist-tools:5 )
-	lua? ( virtual/pkgconfig )"
+	lua? ( virtual/pkgconfig )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
@@ -67,24 +74,25 @@ src_configure() {
 		-DBUILD_GLES3=$(usex gles3)
 		-DBUILD_LIBRETRO=$(usex libretro)
 		-DBUILD_QT=$(usex gui)
+		-DBUILD_ROM_TEST=yes #918855
 		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
 		-DBUILD_SUITE=$(usex test)
-		-DBUILD_UPDATER=OFF
+		-DBUILD_UPDATER=no
 		-DENABLE_SCRIPTING=$(usex lua)
-		-DMARKDOWN=OFF #752048
+		-DMARKDOWN=no #752048
 		-DUSE_DEBUGGERS=$(usex debug)
 		-DUSE_DISCORD_RPC=$(usex discord)
 		-DUSE_EDITLINE=$(usex debug)
 		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=OFF
+		-DUSE_EPOXY=no
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=ON
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
+		-DUSE_LIBZIP=no
+		-DUSE_LZMA=yes
+		-DUSE_MINIZIP=yes
+		-DUSE_PNG=yes
 		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=ON
+		-DUSE_ZLIB=yes
 		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
 	)
 	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
@@ -93,7 +101,7 @@ src_configure() {
 }
 
 src_test() {
-	# CMakeLists.txt forces SKIP_RPATH=ON when PREFIX=/usr
+	# CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
 	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
 
 	cmake_src_test
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index 3bfc5e6ae130..d4ce0e18832b 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,10 +19,14 @@ HOMEPAGE="https://mgba.io/"
 
 LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro lua +opengl +sdl +sqlite test"
+IUSE="
+	debug discord elf ffmpeg gles2 gles3 gui libretro
+	lua +opengl +sdl +sqlite test
+"
 REQUIRED_USE="
 	gui? ( || ( gles2 gles3 opengl ) sqlite )
-	lua? ( ${LUA_REQUIRED_USE} )"
+	lua? ( ${LUA_REQUIRED_USE} )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -33,7 +37,10 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:= )
 	gles2? ( media-libs/libglvnd )
 	gles3? ( media-libs/libglvnd )
-	lua? ( ${LUA_DEPS} )
+	lua? (
+		${LUA_DEPS}
+		dev-libs/json-c:=
+	)
 	opengl? ( media-libs/libglvnd )
 	gui? (
 		dev-qt/qtcore:5
@@ -43,13 +50,16 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )"
+	sqlite? ( dev-db/sqlite:3 )
+"
 DEPEND="
 	${RDEPEND}
-	test? ( dev-util/cmocka )"
+	test? ( dev-util/cmocka )
+"
 BDEPEND="
 	gui? ( dev-qt/linguist-tools:5 )
-	lua? ( virtual/pkgconfig )"
+	lua? ( virtual/pkgconfig )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
@@ -67,25 +77,25 @@ src_configure() {
 		-DBUILD_GLES3=$(usex gles3)
 		-DBUILD_LIBRETRO=$(usex libretro)
 		-DBUILD_QT=$(usex gui)
-		-DBUILD_ROM_TEST=ON #918855
+		-DBUILD_ROM_TEST=yes #918855
 		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
 		-DBUILD_SUITE=$(usex test)
-		-DBUILD_UPDATER=OFF
+		-DBUILD_UPDATER=no
 		-DENABLE_SCRIPTING=$(usex lua)
-		-DMARKDOWN=OFF #752048
+		-DMARKDOWN=no #752048
 		-DUSE_DEBUGGERS=$(usex debug)
 		-DUSE_DISCORD_RPC=$(usex discord)
 		-DUSE_EDITLINE=$(usex debug)
 		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=OFF
+		-DUSE_EPOXY=no
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=ON
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
+		-DUSE_LIBZIP=no
+		-DUSE_LZMA=yes
+		-DUSE_MINIZIP=yes
+		-DUSE_PNG=yes
 		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=ON
+		-DUSE_ZLIB=yes
 		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
 	)
 	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
@@ -94,7 +104,7 @@ src_configure() {
 }
 
 src_test() {
-	# CMakeLists.txt forces SKIP_RPATH=ON when PREFIX=/usr
+	# CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
 	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
 
 	cmake_src_test
@@ -107,3 +117,12 @@ src_install() {
 
 	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
 }
+
+pkg_preinst() {
+	# hack: .shader/ were directories in <0.11 and are now single (zip) files
+	# named the same, that leads to portage mis-merging and leaving an empty
+	# directory behind rather than the new file
+	if use gui && has_version '<games-emulation/mgba-0.11[gui]'; then
+		rm -rf -- "${EROOT}"/usr/share/mgba/shaders/*.shader/ || die
+	fi
+}
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index a511c47672b8..52c1b9a342c1 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,14 +1,11 @@
 AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d
 AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869f6c125dcdf171bb67b9392921d7a006f4b96075086b3927ecede027ff0b2efa40982b10e121c2e1096e36fcbe8bc SHA512 14f0eddbd9c72600f47733a5137c171abf05723b55aedf37438ed89730a9684b67a20d79dea3864531521421c1436922a19667353d7e51253ad3449a99b7b21a
-AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387
 AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7
 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
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-1.7.5214.ebuild 4081 BLAKE2B 1601b3a855841b971604da93bcd5fbff2fa24b2dc8df6f2ade94e119050d2e1487e03c5dccbd1fba53c7ae67aec68fa554e247e05d2aa55adb2fcf11f928085b SHA512 461703f73464f4f2b45118fdc756bf4be04734f0df1b75d99b92c8a9d6834454d618ee2d3ff9f1b2fb4c4d9a29a3bcda35e924186fd107d109b535f94410bf00
 EBUILD pcsx2-1.7.5312.ebuild 4073 BLAKE2B 48d7b0ec3735f21276f66defc07808dafded17fc0cf6688e88ced4566f16e51cf91788c531db9c313826deefc654cd45f0245549fdfa91d9923ab752e8259525 SHA512 2b0b9f82dc01eaa8394ae0fe0da3fe4081a20cd9326dd88d7582444308188ee6be41d00888bc8b9eb1c4fb0bc1751bac34b85c406bd8599983b7a9f4b9dc8d6c
 EBUILD pcsx2-9999.ebuild 3945 BLAKE2B 14ac78f59175569825f7b5cba6e0cbcc3e07e03291761d4f06d28d8f577d4f4e1dd58faaa6ae7f427751fb3949a809873678d4a21e553d8d2040867eb83671ae SHA512 112ef9520c41d2b74ea491378c864d677d75e7f69ac2af3624b41cb7fd45228d8d323f65ead10fa5df15dccb26147e771ad73776308772cf5ea4e3ff1e9ae316
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
deleted file mode 100644
index 804cf29af397..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Same that media-libs/cubeb does and meant for -DLAZY_LOAD_LIBS=no.
-
-Unfortunately need to use bundled cubeb here given it modifies the
-source starting with (but not limited to):
-https://github.com/PCSX2/pcsx2/commit/9170a5abc1
---- a/3rdparty/cubeb/CMakeLists.txt
-+++ b/3rdparty/cubeb/CMakeLists.txt
-@@ -110,38 +110,48 @@
- 
-   find_package(PkgConfig REQUIRED)
- 
-+  if(CHECK_PULSE)
-   pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
-   if(libpulse_FOUND)
-     set(USE_PULSE ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
-   endif()
-+  endif()
- 
-+  if(CHECK_ALSA)
-   pkg_check_modules(alsa IMPORTED_TARGET alsa)
-   if(alsa_FOUND)
-     set(USE_ALSA ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
-   endif()
-+  endif()
- 
-+  if(CHECK_JACK)
-   pkg_check_modules(jack IMPORTED_TARGET jack)
-   if(jack_FOUND)
-     set(USE_JACK ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::jack)
-   endif()
-+  endif()
- 
-+  if(CHECK_SNDIO)
-   check_include_files(sndio.h USE_SNDIO)
-   if(USE_SNDIO)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
-     target_link_libraries(cubeb PRIVATE sndio)
-   endif()
-+  endif()
- 
-+  if(CHECK_AAUDIO)
-   check_include_files(aaudio/AAudio.h USE_AAUDIO)
-   if(USE_AAUDIO)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
-     target_link_libraries(cubeb PRIVATE aaudio)
-   endif()
-+  endif()
- endif()
- 
- if(USE_PULSE)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
deleted file mode 100644
index 462f4b662736..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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
-	# 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 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
-	dev-libs/libaio
-	>=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
-	>=dev-qt/qtsvg-6.6.0:6
-	media-libs/libglvnd
-	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.4[haptic,joystick]
-	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.6.0:6[linguist]
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
-	"${FILESDIR}"/${PN}-1.7.4667-flags.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
-}
-
-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
-		filter-lto
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-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 # X libs are currently hard-required either way
-
-		# 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() {
-	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_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index c093eb2bdde0..880ae24256ed 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,6 +1,4 @@
-DIST pcsx2_patches-0_p20231117.tar.gz 638316 BLAKE2B 331d2ceec0c9e10d5b8cf344a432561173083a37000f8fa3f3890e001a588884e7253bf93d5ca624d36489c9e2f4c0a865de3357d415e9f25d422bedd1106b93 SHA512 7a55a70627b045fd426e88c94e72f191adf72ee01917f9963d4bbfc4a9f96e361efb7bb86487aec4067886458779b42228fd0c5c62f2f07dfada99ba89550d8c
 DIST pcsx2_patches-0_p20231217.tar.gz 647767 BLAKE2B a82211d3a31ee3475d2047ad4c25cc247003b15f8132c0e0fa1c144fff3ea59f0806409aeb9a1128697aee2453110d2da50e9577067d068879a885477b04dc3a SHA512 411431fa80a0a221c7b336ebb84ce9b0c078ff75c2cc79b5e31c9b5fc505f9ecec8b371c142a6be6802e2070ae57758c65df34d24d5392fb9f4065a276b32610
-EBUILD pcsx2_patches-0_p20231117.ebuild 1514 BLAKE2B 46122b5471eab43ada8a8270baa9a6e7690a80e1aa7282f9d5ed866fb082835974e76f230765b8aafe6054c19edb43e2e9441c4cb83833c00ed3086d2089c43a SHA512 3377df1d49035780c33ca1acad2753138629d483cf59e5c99c4e40a9cb145e810b51e388c862778e9b4c27cc62cb5825f05fd3a1f5ed5e98729a6f4af03dce2b
 EBUILD pcsx2_patches-0_p20231217.ebuild 1514 BLAKE2B 00e63d7a6a4b6efb857a95e5abea6d4c5802c4c4bc70f43a9f77368fbbc133a50b263713a9048aa80b2a036b8b79331db0a04a056851ae500416b274e6f449fd SHA512 f5dc27664f54d9cd2eeeeab6ca8742a41e453f7bb023cb0936c86baa20c734bcd0fc75b8d62a909e6574b39cb64cf6ccfebbd4a2d543db82c55247476dfba5dd
 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_p20231117.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231117.ebuild
deleted file mode 100644
index d90b0959a70f..000000000000
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231117.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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=d6195fdc69add33dcc29fd973568896a8e8e6247
-	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
-}