repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/

commit:     b23c6bc8ac4d8709c490e469589b7a26929290e9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 00:02:43 2026 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 00:15:53 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23c6bc8

games-emulation/pcsx2: drop 2.4.0-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest                     |   1 -
 .../pcsx2/files/pcsx2-1.7.4667-flags.patch         |   7 -
 .../pcsx2/files/pcsx2-2.2.0-missing-header.patch   |   8 -
 .../pcsx2/files/pcsx2-2.4.0-qt610.patch            |  30 ----
 games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild        | 185 ---------------------
 5 files changed, 231 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c1def6859ba7..faeb1cfa3b8b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1 @@
-DIST pcsx2-2.4.0.tar.gz 20096340 BLAKE2B bd55dfc7e12545c4979f45de0da8cc075ab9668beb8291657cbaa03ec148b4b31bffce767391e49fa39c195af23bde3ec1aace6cf5cfda47b13e0e8f674f01d6 SHA512 1deb576fbcdb18cd269c2f8493e6d4994ce22d44a34700a98f6884fd16f6417213680faf3eb357947a71c4a756fc7e09ccef95d366da41579ba584fd0c519437
 DIST pcsx2-2.6.3.tar.gz 29166310 BLAKE2B c07ebe97d16911f2487955d9d5f30ce21b435ca6803323ea1256caf84f7103bd771c5f29131111086f94306dc46188cf1391ec078090c65a530ca5f02cf4fc94 SHA512 39a437be98616c5ad8a4b804bbaae6cad845a39885dd9aa5ce2cbc0f913937beef99f96eb6e2b6286a0a0052409cb2da0e22cc736bbad49bc85188a52b9e8e4a

diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
deleted file mode 100644
index ad76cc99c6b6..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-If upstream believes -ffast-math is ok for this part then that is
-fine, but we do not want to override users' -O.
---- a/3rdparty/soundtouch/CMakeLists.txt
-+++ b/3rdparty/soundtouch/CMakeLists.txt
-@@ -43 +43 @@
--		target_compile_options(pcsx2-soundtouch PRIVATE -Ofast)
-+		target_compile_options(pcsx2-soundtouch PRIVATE -ffast-math)

diff --git a/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch b/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch
deleted file mode 100644
index 17d53c1d1ee3..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Fails to build likely(?) with >=clang-19
-SymbolGuardian.cpp:19:7: error: no member named 'unique_lock' in namespace 'std'
---- a/pcsx2/DebugTools/SymbolGuardian.h
-+++ b/pcsx2/DebugTools/SymbolGuardian.h
-@@ -6,2 +6,3 @@
- #include <atomic>
-+#include <mutex>
- #include <thread>

diff --git a/games-emulation/pcsx2/files/pcsx2-2.4.0-qt610.patch b/games-emulation/pcsx2/files/pcsx2-2.4.0-qt610.patch
deleted file mode 100644
index 66dd75095f1b..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-2.4.0-qt610.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Qt6::Gui no longer finds GuiPrivate in Qt 6.10 and it needs to be
-done manually.
-
-For convenience, not patching the earlier "find_package(Qt6 ...)" so
-that the Qt version doesn't prevent applying the patch across versions
-(just a quick fix, not meant for upstream as-is).
-
-Note: unsure if upstream's workflow changed but, given past handling,
-upstream will likely only fix this when they bump Qt in the appimages
-and then bump the required version to >=6.10 rather than do conditions
-(may need to change the fix if 6.10 isn't quite ready for wider usage)
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -115,2 +115,6 @@
- 
-+if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
-+  find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
-+endif()
-+
- # Demangler for the debugger.
---- a/pcsx2-qt/CMakeLists.txt
-+++ b/pcsx2-qt/CMakeLists.txt
-@@ -256,3 +256,2 @@
- target_include_directories(pcsx2-qt PRIVATE
--	${Qt6Gui_PRIVATE_INCLUDE_DIRS}
- 	"${CMAKE_BINARY_DIR}/common/include"
-@@ -267,2 +266,3 @@
- 	Qt6::Gui
-+	Qt6::GuiPrivate
- 	Qt6::Widgets

diff --git a/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild
deleted file mode 100644
index b73b0f5027ed..000000000000
--- a/games-emulation/pcsx2/pcsx2-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# note: keep old versions for an extended period (at "least" 2 months
-# after stabilization unless it is broken) due to save states being
-# locked to specific versions and users may need time
-
-inherit cmake desktop eapi9-ver 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 wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# qtbase:6=[X] is due to using qtx11extras_p.h
-# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-qt/qtbase:6=[X,concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	gui-libs/kddockwidgets:=
-	media-libs/freetype
-	media-libs/libglvnd[X]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl3
-	media-libs/libwebp:=
-	media-libs/plutosvg
-	media-libs/plutovg
-	media-libs/shaderc
-	media-libs/vulkan-loader
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	virtual/zlib:=
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	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-musl-header.patch
-	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
-	"${FILESDIR}"/${PN}-2.2.0-missing-header.patch
-	"${FILESDIR}"/${PN}-2.4.0-qt610.patch
-)
-
-CMAKE_QA_COMPAT_SKIP=1 #957976
-
-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 some 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\|SDL3\)/s/ [0-9.]*//' \
-		-i cmake/SearchForStuff.cmake || die
-
-	# pluto(s)vg likewise often restrict versions and Gentoo also does not
-	# have .cmake files for it, use sed to avoid rebasing on version changes
-	sed -e '/^find_package(plutovg/d' \
-		-e '/^find_package(plutosvg/c\
-			find_package(PkgConfig REQUIRED)\
-			pkg_check_modules(plutovg REQUIRED IMPORTED_TARGET plutovg)\
-			alias_library(plutovg::plutovg PkgConfig::plutovg)\
-			pkg_check_modules(plutosvg REQUIRED IMPORTED_TARGET plutosvg)\
-			alias_library(plutosvg::plutosvg PkgConfig::plutosvg)' \
-		-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
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=yes
-		-DUSE_BACKTRACE=no # not packaged (bug #885471)
-		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no # not packaged
-		-DUSE_VULKAN=yes # currently fails to build without, may revisit
-		-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() {
-	cmake_src_install
-
-	newicon bin/resources/icons/AppIconLarge.png pcsx2.png
-	make_desktop_entry pcsx2-qt PCSX2
-
-	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-}
-
-pkg_postinst() {
-	fcaps cap_net_admin,cap_net_raw=eip usr/bin/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
-
-	if ver_replacing -lt 2.2.0; then
-		elog
-		elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version."
-	fi
-}