gentoo resync : 03.03.2021

6 files changed, 48 insertions, 86 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index bd91bebcba98..15514c08c7bf 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,9 +1,6 @@
-AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d
-AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d
-DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-EBUILD pcsx2-1.4.0-r2.ebuild 2116 BLAKE2B c270c39b91613938a4d9eb3fc2742277521eb28d00d1c68877ab8322ede629be362cc6869d3229a13a4e99720b46068686acbd62f521ee8adc616426aaec0ec8 SHA512 905240f48058af46d6abe65c2c173fa463cff58a3d12cf074d282ede0d59044653a499db04e3ec96ae460da45189c3c67f9d2fac1a488bcdd671e03d5a779574
-EBUILD pcsx2-1.6.0-r1.ebuild 2849 BLAKE2B d2464fb220c257e34f67f14ca95094bb979613f4f7034c966bf20912d861c04a0fa869a52039a7331ea9fc452d955e0976004bff64811b662355b810b83c2567 SHA512 727f02e2908a022b4c4f109ee883403aaeece1acbcdf8ca397b27a85eacf8bc52bd923a29a8a8141995a76269b902aab6261b552f2cb6b135013e82ac22f733e
-EBUILD pcsx2-9999.ebuild 2231 BLAKE2B e3ada612f7e59b1da5328f383b07aed6c9c9296c2f964d3e7ab60d8f0595bb773b8d3855ae83a88e6d7e1357c1776f99ffa9665e65769784a694332324737cc9 SHA512 2749a9d4650b6ec717c2332fd7c25269717cc702b4765ad2b1ed60621687a53a77f8d84e65b87073ce50cd65c9133f076bbaa1740768b17fbd6a1f92b7327beb
+EBUILD pcsx2-1.6.0-r1.ebuild 2844 BLAKE2B d9b207cf4ac343af83f0cfea554a52417f0a93c2a257f47548772a5f1038268b45dd3076b86a0ebf627dd6992280e0db6535a1fd1fcb8e26d6a7ac88caa0fa26 SHA512 70586cf8aa1ef5633fc353d90c1d4f651f2c0a6f4ff27763e6797175024e85b416a1c2f1694cc792f66ef23ccde7b2c9024ec2094b53b5eb81aab6c8bb6a1f08
+EBUILD pcsx2-1.6.0-r2.ebuild 2817 BLAKE2B d683ab3336aa6c2cccf4b800de701fcaf47073db6f6ef4cd1f5e244364f04870281d9d9168277c8ecf17f7c5dcd35e54c7ea8e009f0cfd86fd42a27d656cebac SHA512 0e88e5198ee8089992a1b36f06e1b2841df5552fb3f9bb46d89a56540c3df33e83cbd04012cfa62d78a5cbb7be1a0a10c3a136c20e84f27fcf4fb4c40e0b2d1c
+EBUILD pcsx2-9999.ebuild 2175 BLAKE2B 4f33ac335bb86e8e977177cdcc5c0d25fa71f4cedd74a67f0e3dd0880d01eaeff949e32491a3f7e377aaecb63f00281ca1640e4c4741f24dc9d8d2e89bf174e4 SHA512 1dc252b3afee9d379bab512da3824f65affd2c556745c12b5c77a672de9adeb3de1329196aa53428a10a589b4a8ae830373c2d03156f5283b12fbfa63929d6bd
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
deleted file mode 100644
index cfc941f28244..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 9 Jan 2017 18:37:44 +0400
-Subject: [PATCH] x86emitter: gcc 5 compilation fix
-
----
- common/src/x86emitter/cpudetect.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp
-index 717ca89..cf94d7f 100644
---- a/common/src/x86emitter/cpudetect.cpp
-+++ b/common/src/x86emitter/cpudetect.cpp
-@@ -16,6 +16,9 @@
- #include "PrecompiledHeader.h"
- #include "cpudetect_internal.h"
- #include "internal.h"
-+#if defined(__GNUC__)
-+#include "x86intrin.h"
-+#endif
- 
- using namespace x86Emitter;
- 
--- 
-2.10.2
-
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
deleted file mode 100644
index e90b0df9b6e2..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 171e7f016dc9e132f9faf40a22f0312d45d356a5 Mon Sep 17 00:00:00 2001
-From: Jonathan Li <jonathan.li@hotmail.co.uk>
-Date: Fri, 11 May 2018 01:42:27 +0100
-Subject: [PATCH] common: Work around GCC8 _xgetbv bug
-
-clang and earlier GCC versions do not provide the _xgetbv intrinsic.
-GCC8 does, but unfortunately it's broken.
-(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684).
-
-Re-use our _xgetbv implementation to avoid the bug, but rename it to
-avoid compilation errors as well.
----
- common/include/x86emitter/x86_intrin.h | 7 ++++---
- common/src/x86emitter/cpudetect.cpp    | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
---- a/common/include/intrin_x86.h
-+++ b/common/include/intrin_x86.h
-@@ -107 +107 @@ static __inline__ __attribute__((always_inline)) void __cpuidex(int CPUInfo[], c
--static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index)
-+static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv_pcsx2(unsigned int index)
---- a/common/src/x86emitter/cpudetect.cpp
-+++ b/common/src/x86emitter/cpudetect.cpp
-@@ -273 +276 @@ void x86capabilities::Identify()
--		if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
-+		if((_xgetbv_pcsx2(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index 0333043f873e..c5dffc683898 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,12 @@ MY_PV="${PV/_/-}"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
+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"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index fc48152454b4..d394535a1003 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -1,50 +1,66 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 MY_PV="${PV/_/-}"
 
-inherit cmake multilib wxwidgets
+inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
+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"
+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/libsdl[abi_x86_32(-),joystick,sound]
+	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+:2[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:3.0[abi_x86_32(-),X]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
+	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[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}-gcc5.patch
-	"${FILESDIR}"/${P}-xgetbv.patch
+	"${FILESDIR}/${P}-disable-setcap.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
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
+	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"
@@ -60,6 +76,7 @@ src_configure() {
 		-DARCH_FLAG=
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DDISABLE_SETCAP=TRUE
 		-DEXTRA_PLUGINS=FALSE
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
@@ -68,19 +85,23 @@ src_configure() {
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
+		-DGTK3_API=TRUE
+		-DOPENCL_API=FALSE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
-		-DSDL2_API=FALSE
-		-DWX28_API=FALSE
+		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0" setup-wxwidgets
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
 	cmake_src_configure
 }
 
 src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
+	# 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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 0430a2481682..1555b343b49a 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
+HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
 EGIT_SUBMODULES=()
 
@@ -40,14 +40,11 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/wxGTK:3.0-gtk3[X]
 "
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
-"
+DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
-	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
 )
 
 pkg_setup() {
@@ -73,7 +70,6 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
-		-DEXTRA_PLUGINS=FALSE
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE