4 files changed, 5 insertions, 201 deletions
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 0b6ed8c4c11a..94d98f0970ae 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -2,12 +2,9 @@ AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb0730600
 AUX pcsx2-1.7.5232-cubeb-automagic.patch 774 BLAKE2B a932e49643df613710c27c8f0881c6e2b9c2d90964ff7f88b48b3ec5ad281bbd152fbede638accc054ea5935401ef240ed0bf8107fe1c10997242ea546b93699 SHA512 5985f08a2acce8ccbe946a7c5bd85b2388ad7166b0243a7e698c96990a3856660c1f353bc74a9ced0e5ff08f10e27922e05eb77fabff1e797166b7d6a4c445a7
 AUX pcsx2-1.7.5835-musl-header.patch 247 BLAKE2B 07fa93b782436c575ed43a47694f3517747c33433eefa5563792c169b100bd51cb0fd10b89a60ce80e014ce2388c9b2c1273e20bb7dc950f3251d6fa271ae49e SHA512 32cea2a91d9da892fb84d1326231f3607ad2e85718952f858d3be1e8897e88429bdc12fda9d2a135611cc8854eaf5c1972cdef17f95605e44b7b076e1c8faa77
 AUX pcsx2-1.7.5835-vanilla-shaderc.patch 2637 BLAKE2B 87a0774d44ad6d9b8f5219fbb2c36f4156bbefdeb172b6cca5ac6d310ab569e1687202b97b3056220fd0d5cacd0da1dbb11dcd6912b7d53850fbd0e419d13485 SHA512 1d624fae87b92c509404b0a27218a82163568350f223dbd2d9a2021d5207b923bdf9f7e13d5c6efd89aaea6eeb021ee825dce9be0a389ba0b5ee2adfa4a48c16
-AUX pcsx2-1.7.5855-no-libbacktrace.patch 955 BLAKE2B 035da91a0a64e9960846cd8d12bf649e4c536def15ca47e8a176294fbf389550f25ebb27e8ce55d9777390c1311b3b803410f57c19980dd677ef4c7e0f8d5d40 SHA512 a68d9d09dee53abcf5abe5b6eea3d7a5871d2f43eb6f684ad73f699c7930a8e89b8dc61df96f1f7a030ad90014b29b19080c6e2dc189efca67123b8509d2a04a
 AUX pcsx2-1.7.5913-musl-cache.patch 646 BLAKE2B 531a6792eda8449827019d6332a7a53f32cab006c79784996911ec4305276e506b0fc9dfda81e4ff7d3a835aef2789e2d3d36d8632636494503f6392528ece86 SHA512 56c9d1425f327ac8df040a6237c7cbb04932aabbe7bbdb84307085b0eba07914cf046c908216c6e692d0543fb6c2b0d157d88afd79ce56448bb6cf411847aca7
 AUX pcsx2-2.2.0-missing-header.patch 274 BLAKE2B e1a0428b8dbbdae9a2a9d7386c8797f54c2c499fe2f5ef1df49ab5308053a75a47226da17a1a43e84953ab3c053df26fd370c6b6bf078f138789abe5bcd477de SHA512 565d86bc11d92360630dea97b1ed745526a9b62c44f420db06d68cb26ef5c9145df9a3ad9ea80b00490a4291a63fe36690728f998c4c2d0d1515a72648ea0963
-DIST pcsx2-2.0.2.tar.gz 16071515 BLAKE2B 328ea302ab2a7f7c4784844005ad4091d3f0b571c80f2a122136cc152fd46d4b1db4541e53ada09fc6cd15ebf37ae494911cadbbc7c57b92b494da355f67fcef SHA512 d442b1c5f9dbd1dca23261c56d0a433771928827b1ff9ebf5bea9cf5c5013defab659e7f0b63f5ce5c6ad856461c00f6ac98498a229300f8d58b9ea0ebf21507
 DIST pcsx2-2.2.0.tar.gz 17097731 BLAKE2B 8df1ed7478491444c70a0e481f4ceff5e97d7378c2fee8566f0759f2c8bb1f0f10fb17d5cb26344bbac4150b534c518971bafd984338e386f855f83182d1e755 SHA512 4f67045b38ead6f48f99c27b02924b0ec97d3b79540d62900a6b4e7c3642594e53d37a0360d51077cc1c048175c89d891d7352d7db9231d128564b1d0242b7e0
-EBUILD pcsx2-2.0.2-r1.ebuild 4554 BLAKE2B 658e938acc0e0bc200c03f7efd058cb1fb8c448064d116416d4825e8e2ed014fbfd1920f0b1fac5f0ca64d158a0ac8581fdb74d9fa2aa9cc68e681d6baa9f4cd SHA512 aefb5043a3010022263965a1db85c953f01aa229ee3863c1eaf0439676bb2402c2dafa01fb4539296f3e696d052fe6f9fbe4a73eb196c66296f1b94b54500ccc
-EBUILD pcsx2-2.2.0-r1.ebuild 4585 BLAKE2B 1a1ceb7b95c90ff85a9370ff6a8ba5d3643d6e6f987b4c5205504193d3dc27fb2f3cd1cb71ec3e3afecaac2859192b9bb87a5d18f5e0b0204a69b0559dc87836 SHA512 3463170843d47864e5622ab3698bb97c2cf65315de68274d90ea2ab17811140ac6c932caabc4fe4f6910dcdf7ae2871701834e4a2c4d50f27f2911abe56fd081
+EBUILD pcsx2-2.2.0-r1.ebuild 4749 BLAKE2B 524d758ac821d08fde178d444475008e61625dc70644174a74df21e123351db88da93356f2994e283d4885ea5be5c26f7bc5a69f31c6795116c12384367f8077 SHA512 46e59876ad938e5614c3f6f0a4a24b20150761c7dc34cd4a0cb391eeed4bd2f47c2b0fa9efb305f51487a6e891cfb141187b8f9fe563c21d8c94f951622d3c7f
 EBUILD pcsx2-9999.ebuild 4346 BLAKE2B d0b303f17bde689fd4ac94d73842eba400b912ba0f7b949cd390647e6d5f2492ac6bfc2c9b2829996516cd8637ffb99095bd5ebfefe3fd08fa4fafee55f9c5e8 SHA512 bdacc2f1a579585e6680f64b7c31609a593e3b03d8b274d2d68b212381d73618b7ea91e4eb247120ffc635e9c6855e44725a60adb34aadfb8d871cbe7ca46a4e
 MISC metadata.xml 668 BLAKE2B ae2b523f457cb9bcdaa31d8f6e64ab953d7e6f3d1fab0c26d133fe1f35bf2b26f74eb5ad62c360a9e182eedabbb8c7c2318754778b5b7f1ae1adf89e74fe9e14 SHA512 f3c52eb50a0ed572c84cdb559f58ed2588772ed5d0a2c60844532dae66073ae8ff078263a7bf3a9659a4473d4dfa0df4c5b4e30cc4133c8d219ca4603f9af80b
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch
deleted file mode 100644
index 548f90e8ec1f..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-libbacktrace used to be packaged in Gentoo but was last-rited due
-to [1], and as of [2] pcsx2 no longer let it be optional albeit the
-code to allow this still exists behind __APPLE__ which lacks it.
-
-May be revisited to see if re-packaging may be sane (not looked
-into the issue much, could potentially mask libbacktrace and pcsx2
-on musl, or even bundle libbacktrace), but for now drop the
-dependency again as it is fairly trivial.
-
-[1] https://bugs.gentoo.org/885471
-[2] https://github.com/PCSX2/pcsx2/commit/d48f527d6d88dfbf87
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -71,3 +71,2 @@
- 
--		find_package(Libbacktrace REQUIRED)
- 		find_package(PkgConfig REQUIRED)
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -161,3 +161,2 @@
- 		${DBUS_LINK_LIBRARIES}
--		libbacktrace::libbacktrace
- 		X11::X11
---- a/common/CrashHandler.cpp
-+++ b/common/CrashHandler.cpp
-@@ -178,3 +178,3 @@
- 
--#elif !defined(__APPLE__)
-+#elif 0
- 
diff --git a/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild
deleted file mode 100644
index c4b0100a1622..000000000000
--- a/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	SRC_URI="
-		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-	"
-	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 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-qt/qtbase:6[concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	media-libs/freetype
-	media-libs/libglvnd[X]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl2[haptic,joystick]
-	media-libs/libwebp:=
-	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/shaderc
-		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_p20241020
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	clang? ( llvm-core/clang:* )
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
-	"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
-	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
-	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.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
-
-	# relax Qt6 and SDL2 version requirements which often get restricted
-	# without a specific need, please report a bug to Gentoo (not upstream)
-	# if a still-available older version is really causing issues
-	sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
-		-i cmake/SearchForStuff.cmake || die
-}
-
-src_configure() {
-	# note that upstream only supports clang and ignores gcc issues, e.g.
-	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
-	# (CMakeLists.txt also gives a big warning if compiler is not clang)
-	if use clang && ! tc-is-clang; then
-		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# pthread_attr_setaffinity_np is not supported on musl, may be possible
-	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
-	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-DENABLE_TESTS=$(usex test)
-		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no # not packaged
-		-DUSE_VULKAN=$(usex vulkan)
-		-DWAYLAND_API=$(usex wayland)
-		# not optional given libX11 is hard-required either way and upstream
-		# seemingly has no intention to drop the requirement at the moment
-		# https://github.com/PCSX2/pcsx2/issues/11149
-		-DX11_API=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
-
-	# calls aplay or gst-play/launch-1.0 as fallback
-	# https://github.com/PCSX2/pcsx2/issues/11141
-	optfeature "UI sound effects support" \
-		media-sound/alsa-utils \
-		media-libs/gst-plugins-base:1.0
-}
diff --git a/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild
index 35d596e13f4d..181d5165a2d7 100644
--- a/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild
@@ -113,6 +113,10 @@ src_configure() {
 	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
 	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
 
+	# workaround for clang:20, backporting to old fmt would be complicated
+	# https://github.com/fmtlib/fmt/issues/4177 (probably?)
+	append-cppflags -DFMT_CONSTEVAL=
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes