gentoo auto-resync : 27:11:2023 - 22:51:09

6 files changed, 37 insertions, 4 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 90d27224c484..a5b433bf509b 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index d0aa727c757f..f0b64225ae5a 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,3 +1,3 @@
 DIST mupen64plus-ui-python-e24679436a93e8aae0aa664dc4b2dea40d8236c1.gh.tar.gz 14669412 BLAKE2B 08232599557503d606db9e44bdd6dbb30b3fa125bfd9b9bcc2cbc4b6ea71b567f5af4338d03e7580707db522249d9426ec4d64dc1e941a43076b2d21bc974b67 SHA512 2ba865041827a7f47d5151db6123abd62c964c024c14356aa5434619736b19ce150178d536cff1c84e93d0544823e173c67c0f08054c13e01f085912a9b8c2c6
-EBUILD m64py-0.2.5_p20211222.ebuild 1443 BLAKE2B c1939375fcaf2ad621cc013e1785d5a14b7b3802d659898350be77e87df220c47aba93a2d8417fb7dd352d68a69c60f78464b377a9d220c02b481513c4973dd7 SHA512 5a88618c27153e0d113093c34a957ac56f99a5bf09a45abb710ed5c6798c37623f03eb9caf903c00497de41462d7faf221c3614367645e9b2d6a08e420f55c32
+EBUILD m64py-0.2.5_p20211222.ebuild 1471 BLAKE2B cdc8efdc873839c444588605e3ad8e8e55281f9660e985ec0ebd436387820ba257285cd3fc1ca17a53a4554b8cc4af6895f95d095f1cb7c6d69a837f96db3300 SHA512 c2ebbcef8dee8d1b43026800dfb4ed176405d5d06ab0939262a4f8661af1b8072246c9d6838e686b55e62862dbdcfd83959178e5e4c819cf8b998941cae1c47a
 MISC metadata.xml 529 BLAKE2B b801b519f763b135497d8bab8365efd40917d1ceb8a6a8e1d07f569b6afbdd6b481d959d8fab5735ae2ba524578b3302436ab2bfad02f605f778fa15352cd0f5 SHA512 147e334f1ec9c42f39ec8cb5387a4b28ff95d574dc2dc01e2fb9754f045a7d3850313bb1c000929961fe0922ed82c2c4eb5191bc5188aee2e27b06c3cff08f61
diff --git a/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild b/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild
index 717171eb5f0c..caad3fcc70d1 100644
--- a/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild
+++ b/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1 qmake-utils xdg-utils
 
@@ -44,6 +44,7 @@ RDEPEND="
 	)
 "
 BDEPEND="
+	<dev-python/setuptools-69
 	dev-qt/linguist-tools:5
 "
 
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 1828f055d683..d5abf73cfcca 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -3,11 +3,12 @@ AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869
 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.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
 DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
 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 12e3d234eee7638c5bc629b15567c3fe2d07c3ce0a51becb7269e02aa958d452b3ec80cbc2171a3bce7d56468d0dd311326d81f4be0fdcceada298eaa7d55a05 SHA512 5d442426b1a5e9626a3d71d1818f086bc246395585841c5fef86727bb96075324c72fc4f9c41bd68be20c77412191e916645b2acb7652703ae1a20f1b6d36387
+EBUILD pcsx2-9999.ebuild 4153 BLAKE2B 6c574cfb921d0fc1d56a251663253d188583fe292e2a43220a70f4f5c9fadf415b7920207a7c09913c8e7f3f31514132e2dd49ba43068e58fc6cc3539036c5b4 SHA512 7f7e91282de0ddede835f85a0af15d388b0edfbe12f9fc7927c0ce08adc3fc1fcca871153ca52c0eb43334a10671b77135a673774329aad06fde354269a20656
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5232-cubeb-automagic.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5232-cubeb-automagic.patch
new file mode 100644
index 000000000000..e195ae79c3b1
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5232-cubeb-automagic.patch
@@ -0,0 +1,31 @@
+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 likely limited to):
+https://github.com/PCSX2/pcsx2/commit/9170a5abc1
+--- a/3rdparty/cubeb/CMakeLists.txt
++++ b/3rdparty/cubeb/CMakeLists.txt
+@@ -76,3 +76,5 @@
+ 
++  if(CHECK_PULSE)
+   pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
++  endif()
+   if(libpulse_FOUND)
+@@ -83,3 +85,5 @@
+ 
++  if(CHECK_ALSA)
+   pkg_check_modules(alsa IMPORTED_TARGET alsa)
++  endif()
+   if(alsa_FOUND)
+@@ -90,3 +94,5 @@
+ 
++  if(CHECK_JACK)
+   pkg_check_modules(jack IMPORTED_TARGET jack)
++  endif()
+   if(jack_FOUND)
+@@ -97,3 +103,5 @@
+ 
++  if(CHECK_SNDIO)
+   check_include_files(sndio.h USE_SNDIO)
++  endif()
+   if(USE_SNDIO)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index c2e6420ddbfc..7978166a40b3 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -70,9 +70,9 @@ 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() {