gentoo auto-resync : 29:12:2022 - 08:14:41

3 files changed, 66 insertions, 2 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index db1ccfeefced..f1ff40867921 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -8,6 +8,7 @@ AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d5
 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.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7
+AUX pcsx2-1.7.3803-rapidyaml-0.5.0.patch 2452 BLAKE2B 69584d5871eb8888eef5240a0cdc8bb0c2470e08f5e103733a6662a59e4b25f3e6f5f1cddfcb0a4036c876820f6ee0284655d388192f43848d632835cc7518f7 SHA512 a4f22eea623460f8e0b7a5d5965646e8b7f94d4b2cca28d123d05d8738194d844c5d5bd09f01f178f006990682c7b19c197703e8e450d7aef16569d836737149
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
@@ -18,5 +19,5 @@ DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd7
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-1.7.3602.ebuild 7421 BLAKE2B 80fe2b2d7effdb93b807624984b9f5cdc7c0784443bbe5d9f279b21bb18d9b7dcdfd9816e0b9ffdd5292c6a136e0ec18761167bae57ff2fc31c84b73719ce7b8 SHA512 a1cd4f64dc32e7a0bf2f5d592b322b4b9ac7002c0afc15882602126c65a5bb324b8aa523414bc0a5a98f0956cfee823cbe778f19855f388b59f8f951a05dfcfc
 EBUILD pcsx2-1.7.3738.ebuild 7223 BLAKE2B c02603d27c072519b2e52392dbaad897921af6671593b04ad38d26fe0ef12a33893143c3e2066d04f75cbdd20d5114b26a4a9022fac6bdb6fd872f897633e2ce SHA512 04091cd4c39016d0934468c3e215b6463d488790b978038b306dbc5c205232c685a3bdde823e0868da4d760ea80b761f6dfb5d1e4ba03035f98189d95b09c685
-EBUILD pcsx2-9999.ebuild 7550 BLAKE2B 6d92205f7499448050bedaeff1ace83e697ec233c1fdd6d3ce237ec84400ab69ca97749a4fec42ca6ef2aefcc37f88c36d47594a30c37db8f3baf0ee4ea594c6 SHA512 301038226080b60f4b57156ed92aa86ab4f6f9cfcdce4f5532764c065ea166d4a647c8f4ebb8e12b41e044970c928a8e8f564e2f7804bf7d2335387c2a5cae04
+EBUILD pcsx2-9999.ebuild 7550 BLAKE2B bd11dd6dbb177ef330d387638301a2fbcf4a2de4717559c291568d7ecf948af42f6145a5651a30fac770295955bf4a96bf4d303886376b2274642314be26ff15 SHA512 7c42b4f7b22751c2fe23d2873b865c7cba71b43c2c2d8f9a41226b2d7dbacf8c444cf0cf9612dee04cfc445b40c9157eb66fcc39aef51a9a3cc4fe4d95053f2f
 MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961
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
new file mode 100644
index 000000000000..bded24136fe3
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
@@ -0,0 +1,63 @@
+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
+--- a/pcsx2/GameDatabase.cpp
++++ b/pcsx2/GameDatabase.cpp
+@@ -176,5 +176,5 @@
+ 	if (node.has_child("gameFixes") && node["gameFixes"].has_children())
+ 	{
+-		for (const ryml::NodeRef& n : node["gameFixes"].children())
++		for (const ryml::ConstNodeRef& n : node["gameFixes"].children())
+ 		{
+ 			bool fixValidated = false;
+@@ -207,5 +207,5 @@
+ 	if (node.has_child("speedHacks") && node["speedHacks"].has_children())
+ 	{
+-		for (const ryml::NodeRef& n : node["speedHacks"].children())
++		for (const ryml::ConstNodeRef& n : node["speedHacks"].children())
+ 		{
+ 			bool speedHackValidated = false;
+@@ -237,5 +237,5 @@
+ 	if (node.has_child("gsHWFixes"))
+ 	{
+-		for (const ryml::NodeRef& n : node["gsHWFixes"].children())
++		for (const ryml::ConstNodeRef& n : node["gsHWFixes"].children())
+ 		{
+ 			const std::string_view id_name(n.key().data(), n.key().size());
+@@ -258,5 +258,5 @@
+ 	if (node.has_child("memcardFilters") && node["memcardFilters"].has_children())
+ 	{
+-		for (const ryml::NodeRef& n : node["memcardFilters"].children())
++		for (const ryml::ConstNodeRef& n : node["memcardFilters"].children())
+ 		{
+ 			auto memcardFilter = std::string(n.val().str, n.val().len);
+@@ -268,5 +268,5 @@
+ 	if (node.has_child("patches") && node["patches"].has_children())
+ 	{
+-		for (const ryml::NodeRef& n : node["patches"].children())
++		for (const ryml::ConstNodeRef& n : node["patches"].children())
+ 		{
+ 			// use a crc of 0 for default patches
+@@ -293,5 +293,5 @@
+ 	if (node.has_child("dynaPatches") && node["dynaPatches"].has_children())
+ 	{
+-		for (const ryml::NodeRef& n : node["dynaPatches"].children())
++		for (const ryml::ConstNodeRef& n : node["dynaPatches"].children())
+ 		{
+ 			DynamicPatch patch;
+@@ -299,5 +299,5 @@
+ 			if (n.has_child("pattern") && n["pattern"].has_children())
+ 			{
+-				for (const ryml::NodeRef& db_pattern : n["pattern"].children())
++				for (const ryml::ConstNodeRef& db_pattern : n["pattern"].children())
+ 				{
+ 					DynamicPatchEntry entry;
+@@ -307,5 +307,5 @@
+ 					patch.pattern.push_back(entry);
+ 				}
+-				for (const ryml::NodeRef& db_replacement : n["replacement"].children())
++				for (const ryml::ConstNodeRef& db_replacement : n["replacement"].children())
+ 				{
+ 					DynamicPatchEntry entry;
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 17916151687b..eebe34cc10de 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -128,7 +128,7 @@ 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
+		eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
 
 	cmake_src_prepare