gentoo auto-resync : 11:01:2023 - 17:44:39

6 files changed, 15 insertions, 34 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index fc0abb930cbb..ac90b7a05fe0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -5,9 +5,9 @@ AUX pcsx2-1.7.3329-lto.patch 516 BLAKE2B 84af170687a279a2f78188cff30ecc7ad68c11f
 AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fbccdddadd3d5941057f163c064a1e3d81daff1a90c689fe1d4bb1e645081be9dae2aa63a88caa9b2b83b13cebf SHA512 65f3f241ccda684cee1d382a973ffbda09b290a4878f7c0b3aed279b2fa5aa1f188b7a5bf26a584d2aa4ed12aa9c1c5e15ecebb2c2bb6ae83a7622deba26bdd4
 AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332
 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387
-AUX pcsx2-1.7.3602-rapidyaml-0.5.0.patch 1680 BLAKE2B c14202812b98470c96145875035f4a71717e70d10b6cd2491e94f02e6b4ce70c9577f032b276e4b74910a5150cfb60b2acb4a55be2d2c1a064a8728fc52afdfc SHA512 29bafa6d37202c1c8aaea627f9d05cdf25da01ba8afef7ed0b34aeed114c36f0eb945fe0176cd3b4b67a972a9e757c3158a6c20fe5437d7ff22d9b776cf726cd
+AUX pcsx2-1.7.3602-rapidyaml-0.5.0.patch 1519 BLAKE2B 97a54b242566ebb18fb2c19028fe22a8e9ffa3acc4a84e3d3a0e4199abb5dce29f9820ad1f118b3867239ca6cc046dea5b01f060d8917668e2dbea1e8b7def35 SHA512 00be997ac4a4ec1b7947afe78cf2494690ce94c060b4960eecf07e5e5307c4658061073e338f64ad4cb908bca080d61c221589218a7a3ab02e023f6257c8ff4d
 AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7
-AUX pcsx2-1.7.3803-rapidyaml-0.5.0.patch 2452 BLAKE2B 69584d5871eb8888eef5240a0cdc8bb0c2470e08f5e103733a6662a59e4b25f3e6f5f1cddfcb0a4036c876820f6ee0284655d388192f43848d632835cc7518f7 SHA512 a4f22eea623460f8e0b7a5d5965646e8b7f94d4b2cca28d123d05d8738194d844c5d5bd09f01f178f006990682c7b19c197703e8e450d7aef16569d836737149
+AUX pcsx2-1.7.3803-rapidyaml-0.5.0.patch 2314 BLAKE2B 721989e9a04febcc57cf5a9338b2886a2512069540f7463fec9073bd9df54136b4b363f6965c79aaaf3d6b500b22af4907473e5f50f04e1fcca9855632829eea SHA512 0b266fda0e4c6ffd6362f2256ef18bc4d2acb306f732bf1eaa744c70531199740a27f15727854f6f4a84c50c7e55f8f49259874c810aff8168a24096286cfb1d
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B 39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834 SHA512 6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
@@ -16,7 +16,7 @@ DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 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.3738.ebuild 7179 BLAKE2B 5961ab90cba0d1890d81aefb79306f87a6c58eb81e4d748bc9264d7e5cd32c463dbe0c98a8220453a752c4e420e7df6c3e977373682565bbaac994deb90aaae6 SHA512 b1caa95f1ee816b946db25bd9559ccb29a68f0550b728ffe012b9ecb4d541b2fa763ec7aa7007df30bc6580a77bdafb52a6dcbe1d4b754037da3b120b646cec9
-EBUILD pcsx2-1.7.3820.ebuild 7506 BLAKE2B 647d549dbe57a31e2504fc982d1f6af8bace1b3504cb0e4dc92b791b8726d658dd984c264eb8f1dc25dfae7d57534e2bd03708fffb86dafb5579cf1d8ee28f33 SHA512 b1a5354c7129eac81e12c4d23ba6484acb88e7cd367ea71636fc0181fce8539c4b726c04d5cc126aa60ec10188cc0290f0c5bd34b521a1ccba46673247bdc9bb
-EBUILD pcsx2-9999.ebuild 7617 BLAKE2B db85ca7e1a46bb2a3ad5fb95e239f6082c3d5333cab810450c3981fe0ad4de63e6071a96a6a0ef34c6301553d24a2a9c20681af6b3fd9cb671235cc27a96e0f8 SHA512 79bf50dbbe65c086d6fa769bf4753ba33a377821b3a706434f2b9b684f919c90d17418e6b6f966c585535153860506d9abd455a99aef08c8bdc924fdec6c0133
+EBUILD pcsx2-1.7.3738.ebuild 7016 BLAKE2B cc0f607096ab5f3dad49203b61aa32988b8caf9bc0a23a5f937468605b4c6392ce4f3f4eafd678fe97289a49c1ec67610c880f17cc28a66c37205cd6fe3c8bfc SHA512 530d02d3641615b74d7125f59283ba6fee3b1ce63fb8ef13e6d869a681c9f24f7bd9a66f0d1850589ffa41b49a736d3b477dcfe3c207cfcba1d86f6db2b24456
+EBUILD pcsx2-1.7.3820.ebuild 7343 BLAKE2B 6bb15160c8c3e56a3e816d6b47a76309052cbf70bf027f9aa1d574005ff64c927864f1030f78a1be83f5e40f36c13175320f2d8c4803b4267583d91998320724 SHA512 c7ce9925f37a774a2d5712e1dbe8699b951c38f06726640287ab8619803c5de2873cd1481cfba50062600eb8162d40b9ba2e7aa82d9eb255cd01e7846c4a26c3
+EBUILD pcsx2-9999.ebuild 7416 BLAKE2B 153dcf4953531185e5fd6baae2ddc2cf968cc60e227415967916a25ffbb249b8ab5ec80b14a22826aa07112966dd154105a40ed052e3b333147e6d01bfaf8c5a SHA512 aec1f6895b7f9b6b5e74afbc137cc48b32da2990e9de30dd5d31e6475226487deed90081bbde9447f89a94a1eff33bf2c6298e9eca74829ce9116e1721c4c1ee
 MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
index b3185b47006e..aee1608ea754 100644
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
@@ -1,8 +1,5 @@
-Quick fix taken from Alpine, fixes >=0.5.0 but breaks <0.5.0
-
-Upstream seem to have no intention to acknowledge this as an issue
-until they bump their bundled copy of rapidyaml:
-https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378
+https://github.com/PCSX2/pcsx2/issues/7623
+https://github.com/PCSX2/pcsx2/pull/7847
 --- a/pcsx2/GameDatabase.cpp
 +++ b/pcsx2/GameDatabase.cpp
 @@ -151,5 +151,5 @@
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
index bded24136fe3..b42ae36045ad 100644
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
@@ -1,8 +1,5 @@
-Quick fix for >=0.5.0 (breaks <0.5.0)
-
-Upstream seem to have no intention to acknowledge this as an issue
-until they bump their bundled copy of rapidyaml:
-https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378
+https://github.com/PCSX2/pcsx2/issues/7623
+https://github.com/PCSX2/pcsx2/pull/7847
 --- a/pcsx2/GameDatabase.cpp
 +++ b/pcsx2/GameDatabase.cpp
 @@ -176,5 +176,5 @@
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 740fb1613eaa..57249a1e145e 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
+	>=dev-cpp/rapidyaml-0.5:=
 	dev-libs/libaio
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
@@ -94,6 +94,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
 )
 
 src_unpack() {
@@ -136,11 +137,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# could depend on >=0.5 for unconditional, but rather not force it yet
-	# https://github.com/PCSX2/pcsx2/issues/7623
-	has_version '>=dev-cpp/rapidyaml-0.5' &&
-		eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
-
 	cmake_src_prepare
 
 	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index caf2e5c05300..7c14ae265d5f 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
+	>=dev-cpp/rapidyaml-0.5:=
 	dev-libs/libaio
 	dev-libs/libchdr
 	dev-libs/libfmt:=
@@ -83,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
 )
 
 src_unpack() {
@@ -125,11 +126,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# could depend on >=0.5 for unconditional, but rather not force it yet
-	# https://github.com/PCSX2/pcsx2/issues/7623
-	has_version '>=dev-cpp/rapidyaml-0.5' &&
-		eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
-
 	cmake_src_prepare
 
 	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 73eae17a4f96..1ad975e4a014 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
+	>=dev-cpp/rapidyaml-0.5:=
 	dev-libs/libaio
 	dev-libs/libchdr
 	dev-libs/libfmt:=
@@ -79,10 +79,10 @@ FILECAPS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
 )
 
 src_unpack() {
@@ -125,11 +125,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# could depend on >=0.5 for unconditional, but rather not force it yet
-	# https://github.com/PCSX2/pcsx2/issues/7623
-	has_version '>=dev-cpp/rapidyaml-0.5' &&
-		eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
-
 	cmake_src_prepare
 
 	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \