[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/, ...

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     c75f09735b89ba465ad543ec885718a77566643a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 04:58:25 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 07:26:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75f0973

games-emulation/pcsx2: drop 1.6.0-r3

See bug #922149 for what motivated dropping it even though
it's the upstream stable release.

Note that this drops the x86 keyword, upstream does not
support that anymore (only amd64+sse4.1 is supported).

wrt bug #884825, there is no pcsx2 version left using system
soundtouch.

Closes: https://bugs.gentoo.org/884825
Closes: https://bugs.gentoo.org/922149
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest                     |   1 -
 .../pcsx2/files/pcsx2-1.6.0-disable-setcap.patch   |  49 ----------
 .../pcsx2/files/pcsx2-1.6.0-wx-config.patch        |  20 ----
 games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild        | 105 ---------------------
 profiles/arch/amd64/no-multilib/package.mask       |   1 -
 5 files changed, 176 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index da9e1fbded42..35c955606c1c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1 @@
-DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7

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/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index e94ce63b3476..4a7a71564eb7 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -57,7 +57,6 @@ games-arcade/gish-demo
 games-arcade/jardinains
 games-arcade/thinktanks-demo
 games-emulation/gens
-<games-emulation/pcsx2-1.7
 games-emulation/vgba
 games-emulation/zinc
 games-emulation/zsnes