gentoo auto-resync : 24:05:2024 - 00:07:11

9 files changed, 64 insertions, 28 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 7ff1ce1c46ba..b290714537e0 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 05e9b2dcd867..1633cbfdf5cc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,13 +1,12 @@
 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
 AUX pcsx2-1.7.5700-vanilla-shaderc.patch 751 BLAKE2B d7dde7c368c2231b2876d1e42ae1306f413bcc795a15514e3cbe15bedccc667a60d9ac09b8559ee48513fb144732937bc69e5d722523fb6a3353adebd7ae8464 SHA512 975d490772a7552f748afbc37fddb7acbd3b33e58799b0b4527b24b6d7335436739e8c544a1eee4c73240029a5bd691e318e953c1d9a33e0630061d69a038837
-AUX pcsx2-1.7.5817-missing-headers.patch 452 BLAKE2B 38b873c62a9cf7fe9e7e7357d7a5253ec4cc8532823e08babb8a17ddc03b097d7b170d6b02a7ffb88615a56b4669170980e93aebb22510bb087d83724972d102 SHA512 af6aaa4985e822a859fe65bc9f33f3b3ecc0c3a0c49fbe466d5351366c4bd32438650378db29fe8bbd4d2a72221de61ef61eb226ccfd736123c4eb38cf0d1226
 AUX pcsx2-1.7.5835-vanilla-shaderc.patch 2637 BLAKE2B 87a0774d44ad6d9b8f5219fbb2c36f4156bbefdeb172b6cca5ac6d310ab569e1687202b97b3056220fd0d5cacd0da1dbb11dcd6912b7d53850fbd0e419d13485 SHA512 1d624fae87b92c509404b0a27218a82163568350f223dbd2d9a2021d5207b923bdf9f7e13d5c6efd89aaea6eeb021ee825dce9be0a389ba0b5ee2adfa4a48c16
 DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
 DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d
 DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7
 EBUILD pcsx2-1.7.5624.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
 EBUILD pcsx2-1.7.5724.ebuild 4658 BLAKE2B 0d2fc97197fda74d235b9f653992f0a56ae300510e71b20ddfbc641af68d94c44b25fc3a4abebe7169eb439fd050801137c5f8b7f9a5026279a55bb9d740b3c5 SHA512 f83dcae5a4c7a1699283abef12948ecada3fca29567a58b233384dfa12d870e3b15430a3605d08fcf4ce8cd83df1269da03dc0206d85bc6fbb1c9ce6241838d5
-EBUILD pcsx2-1.7.5835.ebuild 4986 BLAKE2B e9eeba8d6a984bcecbc5d6a369d0f206eaa2f9367ea526653e1da68f1943da7642066c509091ec79450df11d88f93120a182da449d35a4e0f6da3a6b3a4e35ff SHA512 b15cdc481a0462a92b38e88f2710297a678b58e225467e2b08dce682072f13ff127b960012416c326de56ce4715418c3ddaf84b6a18295a93a8c29be629f4214
-EBUILD pcsx2-9999.ebuild 4986 BLAKE2B e9eeba8d6a984bcecbc5d6a369d0f206eaa2f9367ea526653e1da68f1943da7642066c509091ec79450df11d88f93120a182da449d35a4e0f6da3a6b3a4e35ff SHA512 b15cdc481a0462a92b38e88f2710297a678b58e225467e2b08dce682072f13ff127b960012416c326de56ce4715418c3ddaf84b6a18295a93a8c29be629f4214
+EBUILD pcsx2-1.7.5835.ebuild 4934 BLAKE2B da5f60edce65bb0e79ebb679c7cacd33161ca8b40a11ced3e09520b90afe71be4fb706d1acc0dbf049c0a85b5c3a7b905c20b8c1ad1ee443476a591086f93054 SHA512 2f571b64fea43e0a1e6bb6993c70c63bf521dea793f8dc3f7de3494747147a5308327c041df2da9d8b35c675726d774269577423a441a07bfc1056af8e8a2790
+EBUILD pcsx2-9999.ebuild 4934 BLAKE2B da5f60edce65bb0e79ebb679c7cacd33161ca8b40a11ced3e09520b90afe71be4fb706d1acc0dbf049c0a85b5c3a7b905c20b8c1ad1ee443476a591086f93054 SHA512 2f571b64fea43e0a1e6bb6993c70c63bf521dea793f8dc3f7de3494747147a5308327c041df2da9d8b35c675726d774269577423a441a07bfc1056af8e8a2790
 MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
deleted file mode 100644
index d8d341a7dea1..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-ThreadedFileReader.cpp:37:4: error: use of undeclared identifier 'memcpy'
-defs.h:78:14: error: no member named 'clamp' in namespace 'std'
---- a/pcsx2/CDVD/ThreadedFileReader.h
-+++ b/pcsx2/CDVD/ThreadedFileReader.h
-@@ -10,4 +10,5 @@
- #include <atomic>
- #include <condition_variable>
-+#include <cstring>
- 
- class Error;
---- a/pcsx2/SPU2/defs.h
-+++ b/pcsx2/SPU2/defs.h
-@@ -6,4 +6,5 @@
- #include "GS/MultiISA.h"
- 
-+#include <algorithm>
- #include <array>
- 
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index 295c925c4305..3b09dfdebe2d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
 	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
 )
 
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 295c925c4305..3b09dfdebe2d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
 	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
 )
 
diff --git a/games-emulation/pcsx2_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index 0a094063fb68..fc7366a11f42 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,6 +1,8 @@
 DIST pcsx2_patches-0_p20240312.tar.gz 664671 BLAKE2B 3061297d147db103a24c7c20c81723fd0f602ec22b38ab12624816c812431ca7440d8dea15ada71e18fc3da480ddcee50a19bf2186274640f3f3dc264795b0b7 SHA512 400cde1c18e7bb2472ddecf96ae918830cbdc6d61fb12f392d0aeda6219f75cf597440c96c6ae1defaea4e2298925833548a473d3c7000f22e20dedbe0f401b7
 DIST pcsx2_patches-0_p20240416.tar.gz 670438 BLAKE2B e3d9692f89e8b141c816fb433980afc3846c48579b89f2310b9368767c943e74664a880c889dd35f9820db492b2d47ab7828fdd8604d034b941156c10edf4290 SHA512 63c52416c78b35a964427d587967cb709657ff914ab9fb0670b6cf67582ee765e8401e5ada747cdd2486b11ecf8a99e3054335ebb0f0d95b1fea926a2a55ec7e
+DIST pcsx2_patches-0_p20240522.tar.gz 671478 BLAKE2B c3e38009783620aca91539c383694a056c2866e4c6f9360ceea980c341c5b75a653b75780a667f32c332011190a123f0228f6f21539f8ffcd7088e11df74c1ec SHA512 53a36f60ce6de36a9acad52a4913e50c00ad2bfc773d692c9ccdd4cdbaf5342f8a2ff118b1df632a79bc6c4142c6c0ac6e6092d627942521c55af8e1d9ec9850
 EBUILD pcsx2_patches-0_p20240312.ebuild 1518 BLAKE2B 84d6d9a39a1aba38049f98ba155098d69a67c3e42a85e092a737ec26fe3613bafe3e147d113cc37274f3abb975d6642c0dab4bfd2f50d5ed6024c9826a00d1e5 SHA512 e4945006f4360c9e3afecd0fa2102b3d84b7cd98f719b9abff2ae3f047cdc9cef788c97e8eae21b790f27567cb2bfb615efe41f7c49ae904551ed4b63af5b2a1
-EBUILD pcsx2_patches-0_p20240416.ebuild 1519 BLAKE2B 04e7343f0cce7535f6292e76e5baf78f85148ac7886b0503f4f414a31831e1b141be280a0165197a9d8c1db8ee7dd26c2159a0d12de6d2e80ef7290e957fe6f2 SHA512 7d36ad82820502ff156017b94b2f3a2c88c402da1a920e3763a2c828750bd37a68a0c0db64be8ba449104d0036d85ce4dcc48ef44b92eaea47b45f47faca9759
-EBUILD pcsx2_patches-9999.ebuild 1474 BLAKE2B b93d9a65771de4e9699a31e4a8d0b1cefc57a9851fdcb07d711d1aa79ea3b9e8f8b1bfa17d5d1b000be19be72a8ece7d72981bd2dfb06409cefec8ca878a374a SHA512 191e544e1100c701906a01b711c3111d743b3a4a68805a5c22d86fdab5d50e49bb04182ba7933c0e1f555ba50a9c09c4eba7480396adb1547b1bbc893b011a8b
+EBUILD pcsx2_patches-0_p20240416.ebuild 1518 BLAKE2B 54a71ea7a50a2a9c1d100d6fc867aeef9f5ea1bca5367ead8d82eb8f21499c78ba4ba47180593319e67ab9d3a9e4b417b854e2e977118ad8f2c8c18f6ae2e893 SHA512 c99f576c4771dc9792f8ba4f72d5d127f9f2d5a8360101f88fe6d5d2146c4d4f32e7557328c28c43e277be06a619fdde9765484eb376f0b40c013e707c93f8c0
+EBUILD pcsx2_patches-0_p20240522.ebuild 1519 BLAKE2B a947755f5a3992e8da7e39cceb25342a21f36dc18ac7c43409f297e39a003c0a95e603918e3fbb9b8d9e831dba273794b63c42ea10a9f308a6dfbc64784f0c4a SHA512 fdb4fe35c725176de5241ed03b3d246b40a7410d6b086df4df487b02ded1165a8429a009cecc47486b4dbd875bb24edb1cd70e4eb4071413c6eb303db652db4c
+EBUILD pcsx2_patches-9999.ebuild 1479 BLAKE2B b9818bd2ad0cbf654a7dfc134e7a74051f8a29c85720f98096073e01cbfd452d03ea7020af6d56dc651f529665aea07d36a316e3705fd097de76be5a34350bc5 SHA512 862d949cadf0c209c85a53d2e34da75c3f000044e8530065a2997a5c1f47866976a7370300bf4f5b3409c8fb87c360db2b024676cc9b7d1b62d63db9696a6735
 MISC metadata.xml 362 BLAKE2B 3b213785f8a28bc1e2f540e27b025d4397dec5f7885fcc8f7e3fa56186b8f023ef97de5ff7b927a8c09ad1f79baee546d08b25cf865e344197a1640470f37641 SHA512 f00b1d14ba779989c235775de6f2470e18b29f2813723eae51015681af2d2c798aeddaa9657897c83b8bcb0b124ea77b34cf6370e37104fa24a968834ea5fabb
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240416.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240416.ebuild
index 198c47008fcd..c5fde4324ff3 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240416.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240416.ebuild
@@ -16,7 +16,7 @@ else
 			-> ${P}.tar.gz
 	"
 	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)"
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240522.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240522.ebuild
new file mode 100644
index 000000000000..578fde2db2eb
--- /dev/null
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240522.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+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=0c9322aa5a51c4f51310892ae5a7a26d8358a524
+	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
+}
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
index e4f775a8776c..5db2b6b2fda3 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit python-any-r1
 
 if [[ ${PV} == 9999 ]]; then