gentoo auto-resync : 15:01:2024 - 13:18:00

6 files changed, 37 insertions, 207 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 52c1b9a342c1..7626d80a3220 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,11 +1,7 @@
-AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d
-AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869f6c125dcdf171bb67b9392921d7a006f4b96075086b3927ecede027ff0b2efa40982b10e121c2e1096e36fcbe8bc SHA512 14f0eddbd9c72600f47733a5137c171abf05723b55aedf37438ed89730a9684b67a20d79dea3864531521421c1436922a19667353d7e51253ad3449a99b7b21a
 AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7
 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
-DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
-EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-1.7.5312.ebuild 4073 BLAKE2B 48d7b0ec3735f21276f66defc07808dafded17fc0cf6688e88ced4566f16e51cf91788c531db9c313826deefc654cd45f0245549fdfa91d9923ab752e8259525 SHA512 2b0b9f82dc01eaa8394ae0fe0da3fe4081a20cd9326dd88d7582444308188ee6be41d00888bc8b9eb1c4fb0bc1751bac34b85c406bd8599983b7a9f4b9dc8d6c
-EBUILD pcsx2-9999.ebuild 3945 BLAKE2B 14ac78f59175569825f7b5cba6e0cbcc3e07e03291761d4f06d28d8f577d4f4e1dd58faaa6ae7f427751fb3949a809873678d4a21e553d8d2040867eb83671ae SHA512 112ef9520c41d2b74ea491378c864d677d75e7f69ac2af3624b41cb7fd45228d8d323f65ead10fa5df15dccb26147e771ad73776308772cf5ea4e3ff1e9ae316
+EBUILD pcsx2-1.7.5312.ebuild 4242 BLAKE2B 0f0308b0bf27f2d6d5345773715ddbc523a68b3276469dfd2de19bb8515e4edb35d8689423ec272fbda8b4a9e326c19d1b6249192efb08820bffdc816d33dc29 SHA512 f00c2ebc324fc48e2ce13dfab360c212877e549c482e1103acd746bf03395daf30603128494f826dae21b69390a4a1e1f485985b295eded58a0c525dac07d825
+EBUILD pcsx2-9999.ebuild 4320 BLAKE2B d743f7d48b00a56e460261fe7488822a85de42191967ef1f315f35a00b9d53af582c72ebb8f76566232a4a095aa6a5b6974f6b7bc4e15ff14e9c4490948ec483 SHA512 5aab04e43d7f4c56cb53d869c5e2822a1ce4ea478492662e4070caeb1723a6616097d742fda3b8320b98b7ad2b040c63c8fde86b5badce10ed8528044447033d
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch b/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
deleted file mode 100644
index 07040b62b91b..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4366d2973316a6c250a17cf9a170f187e2ed9f93 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Sat, 17 Oct 2020 12:05:36 +0400
-Subject: [PATCH] Added cmake options to bypass setcap execution.
-
-This call became a problem with distributions (eg Gentoo GNU/Linux) that
-builds PCSX2 in sandboxed environment which disallows setcap execution.
-
-Signed-off-by: Yuri Konotopov <ykonotopov@gnome.org>
----
- cmake/BuildParameters.cmake |  1 +
- pcsx2/CMakeLists.txt        | 10 ++++++----
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
-index 235bdb8e5..a3ff0041f 100644
---- a/cmake/BuildParameters.cmake
-+++ b/cmake/BuildParameters.cmake
-@@ -46,6 +46,7 @@ option(GSDX_LEGACY "Build a GSdx legacy plugin compatible with GL3.3")
- option(PACKAGE_MODE "Use this option to ease packaging of PCSX2 (developer/distribution option)")
- option(DISABLE_CHEATS_ZIP "Disable including the cheats_ws.zip file")
- option(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file")
-+option(DISABLE_SETCAP "Do not set files capabilities")
- option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
- option(EXTRA_PLUGINS "Build various 'extra' plugins")
- option(SDL2_API "Use SDL2 on spu2x and onepad (wxWidget mustn't be built with SDL1.2 support" ON)
-diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
-index 6839089d7..6e129caca 100644
---- a/pcsx2/CMakeLists.txt
-+++ b/pcsx2/CMakeLists.txt
-@@ -739,9 +739,11 @@ endif()
- add_pcsx2_executable(${Output} "${pcsx2FinalSources}" "${pcsx2FinalLibs}" "${pcsx2FinalFlags}")
- 
- if(dev9ghzdrk)
--    if(PACKAGE_MODE)
--        install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
--    else()
--        install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
-+    if(NOT DISABLE_SETCAP)
-+        if(PACKAGE_MODE)
-+            install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
-+        else()
-+            install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
-+        endif()
-     endif()
- endif()
--- 
-2.26.2
-
diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch
deleted file mode 100644
index bfa12b893dcd..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Don't attempt to use /usr/bin/wx-config-3.0 which can point to the
-wrong wx-config depending on eselect'ed wxGTK profile. Furthermore
-that path does not use ESYSROOT.
-
-If unset, FindwxWidgets.cmake will use WX_CONFIG environment
-set by the wxwidgets eclass.
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -50,4 +50,5 @@
- # lib32-wx3.0 => /usr/bin/wx-config32-3.0
- # FindwxWidgets only searches for wx-config.
-+#[[
- if(CMAKE_CROSSCOMPILING)
-     # May need to fix the filenames for lib32-wx3.0.
-@@ -71,4 +72,5 @@
-     endif()
- endif()
-+#]]
- 
- find_package(wxWidgets COMPONENTS base core adv)
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
deleted file mode 100644
index 763aa3e53529..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/libudev[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:3[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-setcap.patch"
-	"${FILESDIR}/${P}-wx-config.patch"
-)
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		append-flags -mxsave
-	fi
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
-
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
-
-	local mycmakeargs=(
-		-DARCH_FLAG=
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DDISABLE_SETCAP=TRUE
-		-DEXTRA_PLUGINS=FALSE
-		-DOPTIMIZATION_FLAG=
-		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DEGL_API=FALSE
-		-DGTK3_API=TRUE
-		-DOPENCL_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
-		-DUSE_VTUNE=FALSE
-
-		# mimic old toolchain file behavior (bug #833100 comment #20)
-		-DCMAKE_SYSTEM_IGNORE_PATH="${ESYSROOT}"/usr/lib64
-	)
-
-	setup-wxwidgets
-	cmake_src_configure
-}
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake_src_install
-}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index 223990367c6d..a675a321a728 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"
@@ -31,11 +31,11 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
-	>=dev-qt/qtsvg-6.6.0:6
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	media-libs/libsdl2[haptic,joystick]
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
@@ -61,7 +61,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	>=dev-qt/qttools-6.6.0:6[linguist]
+	dev-qt/qttools:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -81,16 +81,17 @@ src_prepare() {
 		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() {
-	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
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 43536202eed1..328235f14174 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake desktop fcaps flag-o-matic
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -33,11 +33,11 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
-	>=dev-qt/qtsvg-6.6.0:6
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.5[haptic,joystick]
+	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=
 	media-video/ffmpeg:=
 	net-libs/libpcap
@@ -64,7 +64,8 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	>=dev-qt/qttools-6.6.0:6[linguist]
+	dev-qt/qttools:6[linguist]
+	sys-devel/clang:*
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -72,7 +73,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
 )
@@ -84,21 +84,28 @@ src_prepare() {
 		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() {
-	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
+	# upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	if ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
 	fi
 
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
-		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no