6 files changed, 216 insertions, 2 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b38e483b4fa2..b3be83e9bcc1 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 70de53456751..61f647255736 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -5,7 +5,9 @@ AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c9694
 AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83
 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-9999.ebuild 4168 BLAKE2B 7dfe5e21c61c26da0a05aa35702f6ca1f7b67a88f4172cce5bb1bc950047621cda4a3aed6080abb74d2daaba79db9dd00934016839b79f99fff1b4bd6d17c567 SHA512 1cb88520f1ef9b4566d4dd27135dbb48869c9bd1253b10320064d379bfeddef8fb998805b3ba3008283b8d4685d53adce80b3db4566551d594035a23ae19d3ba
+EBUILD pcsx2-1.7.5214.ebuild 4161 BLAKE2B 135f3f2ef2d9cd81c38d1cee27ccf6fde69ce123ade0fd5b769a180372752ef891d9e27327df521a175102f6821a68a3c23b3b909d11323af9cfff27527cc1d2 SHA512 77ef94304f9432665d9ac0d39a6238ab22efb7b7a3b64420ebb942412eac90276ab299ba4b65d6dc1750e8df40928074b94335f939fb747a13ebb88ff4d2f597
+EBUILD pcsx2-9999.ebuild 4161 BLAKE2B 135f3f2ef2d9cd81c38d1cee27ccf6fde69ce123ade0fd5b769a180372752ef891d9e27327df521a175102f6821a68a3c23b3b909d11323af9cfff27527cc1d2 SHA512 77ef94304f9432665d9ac0d39a6238ab22efb7b7a3b64420ebb942412eac90276ab299ba4b65d6dc1750e8df40928074b94335f939fb747a13ebb88ff4d2f597
 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
new file mode 100644
index 000000000000..cf1118563fd6
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+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
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libaio
+	>=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
+	>=dev-qt/qtsvg-6.6.0:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-qt/qttools-6.6.0:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DX11_API=yes # X libs are currently hard-required either way
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
+
+		# not packaged due to bug #885471, but still disable for no automagic
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
+
+		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	insinto /usr/lib/${PN}
+	doins -r "${BUILD_DIR}"/bin/.
+
+	fperms +x /usr/lib/${PN}/pcsx2-qt
+	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
+
+	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^^}
+
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+
+	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
+}
+
+pkg_postinst() {
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
+
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
+		elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
+		elog "to backup configs, save states, and memory cards before using."
+		elog
+		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index e13f2c5a2b74..cf1118563fd6 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -79,7 +79,7 @@ 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_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index cd691642f9e2..e35bfd52d37b 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,4 +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
+EBUILD pcsx2_patches-0_p20231117.ebuild 1514 BLAKE2B 46122b5471eab43ada8a8270baa9a6e7690a80e1aa7282f9d5ed866fb082835974e76f230765b8aafe6054c19edb43e2e9441c4cb83833c00ed3086d2089c43a SHA512 3377df1d49035780c33ca1acad2753138629d483cf59e5c99c4e40a9cb145e810b51e388c862778e9b4c27cc62cb5825f05fd3a1f5ed5e98729a6f4af03dce2b
 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_p20231117.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231117.ebuild
new file mode 100644
index 000000000000..d90b0959a70f
--- /dev/null
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231117.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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=d6195fdc69add33dcc29fd973568896a8e8e6247
+	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
+}