7 files changed, 18 insertions, 21 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 4db5da7a1634..a4f9bfdd58a1 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d5abf73cfcca..8e816e254f78 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -5,10 +5,10 @@ AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c9694
 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.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
 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.5133.ebuild 4168 BLAKE2B 33c598c9ff77674cd8004a29b68c4ccc43e1340a4ab297ce5477a9f57d700d8d7b7eae64b56358058027ea0f7b60edee50c45079ff04cc81282a85b46d6f6f2a SHA512 4debfac11d464b1112988b6b58a1b8faa1dfd1480b8b1b15eb6b113549c8a5947eda1efb312dd22a146a0ce208cefc14da92484aab7cb2a238f3994fd9cc3884
-EBUILD pcsx2-1.7.5214.ebuild 4161 BLAKE2B 135f3f2ef2d9cd81c38d1cee27ccf6fde69ce123ade0fd5b769a180372752ef891d9e27327df521a175102f6821a68a3c23b3b909d11323af9cfff27527cc1d2 SHA512 77ef94304f9432665d9ac0d39a6238ab22efb7b7a3b64420ebb942412eac90276ab299ba4b65d6dc1750e8df40928074b94335f939fb747a13ebb88ff4d2f597
-EBUILD pcsx2-9999.ebuild 4153 BLAKE2B 6c574cfb921d0fc1d56a251663253d188583fe292e2a43220a70f4f5c9fadf415b7920207a7c09913c8e7f3f31514132e2dd49ba43068e58fc6cc3539036c5b4 SHA512 7f7e91282de0ddede835f85a0af15d388b0edfbe12f9fc7927c0ce08adc3fc1fcca871153ca52c0eb43334a10671b77135a673774329aad06fde354269a20656
+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 4073 BLAKE2B 48d7b0ec3735f21276f66defc07808dafded17fc0cf6688e88ced4566f16e51cf91788c531db9c313826deefc654cd45f0245549fdfa91d9923ab752e8259525 SHA512 2b0b9f82dc01eaa8394ae0fe0da3fe4081a20cd9326dd88d7582444308188ee6be41d00888bc8b9eb1c4fb0bc1751bac34b85c406bd8599983b7a9f4b9dc8d6c
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
index cf1118563fd6..462f4b662736 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
+	# 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
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index 63a7bbdd2c1d..223990367c6d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
+	# 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
@@ -32,8 +31,8 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
-	>=dev-qt/qtsvg-6.5.3:6
+	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
+	>=dev-qt/qtsvg-6.6.0:6
 	media-libs/libglvnd
 	media-libs/libpng:=
 	>=media-libs/libsdl2-2.28.4[haptic,joystick]
@@ -62,7 +61,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	>=dev-qt/qttools-6.5.3:6[linguist]
+	>=dev-qt/qttools-6.6.0:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -70,16 +69,16 @@ BDEPEND="
 "
 
 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.5232-cubeb-automagic.patch
 )
 
 src_prepare() {
 	cmake_src_prepare
 
 	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
 	fi
 }
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7978166a40b3..223990367c6d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
+	# 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
diff --git a/games-emulation/pcsx2_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index e35bfd52d37b..c093eb2bdde0 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,6 +1,6 @@
-DIST pcsx2_patches-0_p20231015.tar.gz 626844 BLAKE2B cde4e81aa354839f4e49a20cbf3d375704b9a09cf30283bfe61c0b2fcd213dd0e33431875eba3d7f5fc4ca45cb779ba1916f787464a922a5cfc484e75b727205 SHA512 6a53806ff8f348946539fb3f960e91bc40d01f8c7d6acd2e07cfbea938bd5abf4d820b1c26f19b46d103438d32325c02942a879ce3f500e30a6f5fe8b776d46c
 DIST pcsx2_patches-0_p20231117.tar.gz 638316 BLAKE2B 331d2ceec0c9e10d5b8cf344a432561173083a37000f8fa3f3890e001a588884e7253bf93d5ca624d36489c9e2f4c0a865de3357d415e9f25d422bedd1106b93 SHA512 7a55a70627b045fd426e88c94e72f191adf72ee01917f9963d4bbfc4a9f96e361efb7bb86487aec4067886458779b42228fd0c5c62f2f07dfada99ba89550d8c
-EBUILD pcsx2_patches-0_p20231015.ebuild 1514 BLAKE2B fff36eb37657fca9a82c4003bf415dddf48376fe8a47e7c7b510804c2750e1f9d662e3177772479e17fdca51eb08311851590908b324eb34eac974e0582e910f SHA512 f18af92e33e78482bb1501ede2c3b3be88ad80353572c7a2f3f227d282796f11d71fa3c9262fb64bf76f1783d8ae2c09d73e8c09c1b6333c2c42fcec00b16451
+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_p20231015.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231217.ebuild
index 76995605c664..7255f844e8f5 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231015.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231217.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2_patches.git"
 else
-	HASH_PCSX2_PATCHES=4a843d2fb7d9e44532e496b8968bbcf28673b99a
+	HASH_PCSX2_PATCHES=42d7ee72b66955e3bbd2caaeaa855f605b463722
 	SRC_URI="
 		https://github.com/PCSX2/pcsx2_patches/archive/${HASH_PCSX2_PATCHES}.tar.gz
 			-> ${P}.tar.gz