gentoo auto-resync : 23:09:2022 - 05:29:13

11 files changed, 470 insertions, 58 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 55331a451543..156cee2265c5 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 6533bf8da32c..6d8bba380a0c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,7 +1,17 @@
 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.0-crcs.patch 1456 BLAKE2B e4dc096bf863d5067816b2755ba84a6f7e6d9163b19e3517906c012a62bf35f5702f887c9f42ada87e23d6f10490e1d68d9d68864c96b40acb95c4ae7175f0be SHA512 2c283c38382983c2acc95ea369c1becf43266101edf5b4dd7824346a813061a3146cd3fdaad38936f3d208140dcf02ff02c1d43eac4e95cbcf5dcb3449a1a525
+AUX pcsx2-1.7.3329-clang16.patch 719 BLAKE2B fe30a93226097a11f1df4de32f6c5061282b8593123be05501cea3e92103c96ad63f4ba857e09a05687efce066bb9e901a1a4822bf0ad7bd44a02dd0496b62f9 SHA512 5b29f2099673e8797596dcf6e7522c00b27ada853ed7c3abd764f591968a132fac5f9ddd5a392254076375ff29b5720eb2527b257c6a4887bc0547fc07c59478
+AUX pcsx2-1.7.3329-lto.patch 516 BLAKE2B 84af170687a279a2f78188cff30ecc7ad68c11f4d5300b20fb06ac745770869c2c70f7ff43a069d225520ae56fe9d960706dc53f03890caeb46ce0efddea312e SHA512 c94a7b4c52ac9a4a7918f275dc7083b63c0a3992aa86d7ca424a229400893b1234381a3111249e3d5e88de9486e784d0a7e8977bbf853b215e2f6a4fc8bcb822
+AUX pcsx2-1.7.3329-musl.patch 292 BLAKE2B 02717d90a08caddc6c0df32137fc73fc4426f9df1b123cfc7dee051e918b23d1659278d7ab14823d7208b487486deed949ab2e3c93046980e5dbd7369cd4accf SHA512 5a28effab686c38e8d12d53244074736595a3f2cf6b4ac9997289b695642094e50d20558427c4108c5b0fd782ca4a91401099ab5c04778d30b4cba31aae29923
+AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fbccdddadd3d5941057f163c064a1e3d81daff1a90c689fe1d4bb1e645081be9dae2aa63a88caa9b2b83b13cebf SHA512 65f3f241ccda684cee1d382a973ffbda09b290a4878f7c0b3aed279b2fa5aa1f188b7a5bf26a584d2aa4ed12aa9c1c5e15ecebb2c2bb6ae83a7622deba26bdd4
+AUX pcsx2-1.7.3329-unbundle.patch 1493 BLAKE2B 9d37c36773d594bfc045ecf50680a422e597c96ce76e934a4ed7cc91c6ee2a1f3bb162eeb04a4437fbd5be1e064dff295702b4bcb1352a0064ba7fa697114175 SHA512 b142b2fa1aaf68437f47bd33d30e474543fea05794c67321b3b19746d95ceb7f02196ff8518bb2cc85fd52d43a4233955a31842edf38e9560e3f32204d2fd9d4
+AUX pcsx2-1.7.3329-wx-vs-sdl.patch 350 BLAKE2B 17e54fd9150ad7d8d3545e474b5579ae8b8e1df1b38b510931dee73e566903b6f9397d2dec537f6d6425d61a966f71169f84a863c0e0a82203ce21ab3f514fef SHA512 9240e808886b746d74828405a931c6dc4d093f3ab22619b2a5d349f737a241c2b7545771931a4b77385d6cb6583124a01ba24faf74f43914fdc62c6f33dd39b1
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
+DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
+DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
+DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-9999.ebuild 2901 BLAKE2B 24f46208fce97c2ffba581f7f630c175c3e8820f36ff4e18cb9939f1ad9f1734b5aa785e7cef94ec5bf7f1b10606ef33e2f3039770055304fee6123e889aaae3 SHA512 d7844952772ff556993eb8664704e501a7c130f0768d0e5c26c7ad90bb7a47c0672f0526f656b47a42cf47cb9f1c0f3e0796332b4d89fa6a2d660b64d8aeda3c
-MISC metadata.xml 647 BLAKE2B 506f329d6430ac9d3646a71ad9d0fc3a41689480c1539381f21c042f584e3b4fa8564a31d4c664220549b8271732039791c63c75ae7b1697c5a07d68e9bd5b58 SHA512 713b4466ba59a4a0cd7d1f08686198fe6a37067c1eedea3f1d72323efa6c9d914f5d7bf2de24ca37b31cc3788a689071b09116539f20fb5c80a23397285a2f12
+EBUILD pcsx2-1.7.3329.ebuild 5637 BLAKE2B be0d00a3860ce1833eab6fd178cebdee64b7d753541a88d4e0c13db945bb71eb232a6f11fc766dbc445d7c9762e41894f1a0f96e0304686d51567510ced0c629 SHA512 9fd37c71ec23b46adf39f25c3def607b9e6c7acc27f9f8739296cbfe182eebbbf91b5262a756fd7ad743972bc75ffb9c6cff3c39249dcff7186306ee750a7b1f
+EBUILD pcsx2-9999.ebuild 5620 BLAKE2B c0b847541d3801d6f52ecf16b6dd37e6e94c6aee17c82619057100bc1789b3d9dfcc9090e35e174e2e963de019bf1fecfb8abb471af375b63040976e58e9f83b SHA512 44c12b1c2a05fc9ef0a6475147fb830f23c3d5a3a136e5dfffd4b6e0beccf21e0f34cdd96ce99dd1cfbf34521943b78b6f91915f720e1c8804fa1b2b1c076052
+MISC metadata.xml 797 BLAKE2B 9536213247a29ac842e44a2ddef336ae0799c4acc8733823949eabda4f1d3bfb4c793141b99031c6889e346ff97d3b42c7b4c8139cb7494e2364fa58717eaa26 SHA512 ee72fc85420b247cc9db5f25d650532311a21490b8dcd4b5b048614bd0e03716c821b3f6586a21fccc0d9e14d0af6e8de774375703e7e34d5c2efe04096615f4
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
new file mode 100644
index 000000000000..331101ed6a1c
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/870412
+--- a/3rdparty/cpuinfo/src/api.c
++++ b/3rdparty/cpuinfo/src/api.c
+@@ -78 +78 @@
+-const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
++const struct cpuinfo_uarch_info* cpuinfo_get_uarchs(void) {
+--- a/cmake/FindPCAP.cmake
++++ b/cmake/FindPCAP.cmake
+@@ -47 +47 @@
+-check_c_source_compiles("int main() { return 0; }" PCAP_LINKS_SOLO)
++check_c_source_compiles("int main(void) { return 0; }" PCAP_LINKS_SOLO)
+@@ -55 +55 @@
+-		check_c_source_compiles("int main() { return 0; }" PCAP_NEEDS_THREADS)
++		check_c_source_compiles("int main(void) { return 0; }" PCAP_NEEDS_THREADS)
+--- a/tests/ctest/CMakeLists.txt
++++ b/tests/ctest/CMakeLists.txt
+@@ -20 +20 @@
+-	int main() {
++	int main(void) {
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
new file mode 100644
index 000000000000..1047105d646a
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
@@ -0,0 +1,21 @@
+Lazy fix for -Werror=odr and don't rely on the CMAKE macro to
+pass -fno-lto to the problematic FastJmp.cpp source with lto.
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -268,3 +268,3 @@
+ 
+-if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
++if (USE_GCC)
+ 	# GCC LTO doesn't work with asm statements
+--- a/pcsx2/PAD/Linux/Device.h
++++ b/pcsx2/PAD/Linux/Device.h
+@@ -31,3 +31,3 @@
+ 
+-enum DeviceType
++enum PADDeviceType
+ {
+@@ -101,3 +101,3 @@
+ 	DeviceAPI api;
+-	DeviceType type;
++	PADDeviceType type;
+ 
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
new file mode 100644
index 000000000000..95d2ff38a8c2
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
@@ -0,0 +1,9 @@
+--- a/pcsx2/USB/qemu-usb/iov.h
++++ b/pcsx2/USB/qemu-usb/iov.h
+@@ -17,5 +17,5 @@
+ #define IOV_H
+ 
+-#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) /* /usr/include/bits/uio.h */
++#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) && !defined(__DEFINED_struct_iovec)
+ struct iovec
+ {
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
new file mode 100644
index 000000000000..9ef82985dc99
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
@@ -0,0 +1,10 @@
+https://github.com/PCSX2/pcsx2/commit/6386be09c2e disabled PACKAGE_MODE
+for reasons that make no sense as far as installing from an ebuild goes.
+
+Skip the error and handle the rest from the ebuild.
+--- a/pcsx2-qt/CMakeLists.txt
++++ b/pcsx2-qt/CMakeLists.txt
+@@ -7,3 +7,2 @@
+ if (PACKAGE_MODE)
+-	message(FATAL_ERROR "Package mode is not supported for Qt builds.")
+ else()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
new file mode 100644
index 000000000000..450329522183
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
@@ -0,0 +1,41 @@
+Adjust to unbundle a few extras.
+
+zstd changes only needed because of https://bugs.gentoo.org/872254
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,3 +54,4 @@
+ 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-	add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL)
++	find_package(GTest REQUIRED)
++	alias_library(gtest_main GTest::gtest_main)
+ 	add_subdirectory(tests/ctest)
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -177,3 +177,3 @@
+ set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
+-if(ENABLE_TESTS)
++if(0)
+ 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
+@@ -210,7 +210,4 @@
+ find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
+-find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
+-if (${zstd_TYPE} STREQUAL System)
+-	alias_library(Zstd::Zstd zstd::libzstd_shared)
+-	alias_library(pcsx2-zstd zstd::libzstd_shared)
+-endif()
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
+ find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
+@@ -243,3 +240,4 @@
+ add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL)
+-add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
++pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
++alias_library(chdr-static PkgConfig::chdr)
+ 
+@@ -269,5 +267,3 @@
+ if(CUBEB_API)
+-	add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL)
+-	target_compile_options(cubeb PRIVATE "-w")
+-	target_compile_options(speex PRIVATE "-w")
++	find_package(cubeb REQUIRED)
+ endif()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
new file mode 100644
index 000000000000..d00f9553993d
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
@@ -0,0 +1,9 @@
+This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1
+/only/ if wxGTK was built with USE=sdl or else get a cmake unused options
+warning. Test code also fails with -Werror=strict-prototypes (clang16).
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -191,3 +191,2 @@
+ if(NOT PCSX2_CORE)
+-	WX_vs_SDL()
+ endif()
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 0d8f2efac4cd..40c13d5f12ff 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -13,6 +13,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="qt6">Add support for the Qt 6 application and UI framework</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
 		<remote-id type="github">PCSX2/pcsx2</remote-id>
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
new file mode 100644
index 000000000000..e43b31a9499e
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic wxwidgets
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		vulkan? (
+			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.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 GPL-2+ LGPL-2.1+
+	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/rapidyaml:=
+	dev-libs/libaio
+	dev-libs/libchdr
+	>=dev-libs/libfmt-7.1.3:=
+	dev-libs/libzip:=[zstd]
+	media-libs/cubeb
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
+	media-libs/libsoundtouch:=
+	net-libs/libpcap
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXrandr
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+		net-misc/curl
+	)
+	!qt6? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		pulseaudio? ( media-libs/libpulse )
+	)
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	dev-lang/perl
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( sys-devel/gettext )"
+
+FILECAPS=(
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
+	"${FILESDIR}"/${PN}-1.7.3329-clang16.patch
+	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
+	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
+	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
+	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=()
+		if use vulkan; then
+			EGIT_SUBMODULES+=(
+				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
+				3rdparty/vulkan-headers # to keep in sync with glslang
+			)
+		fi
+		git-r3_src_unpack
+	else
+		default
+		if use vulkan; then
+			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
+	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
+		-i pcsx2/Frontend/CommonHost.cpp || die
+
+	# pulseaudio is only used for usb-mic and without qt6, not for audio output
+	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
+
+	# GS tests currently fail to build with qt6
+	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
+
+	# delete all 3rdparty/* except known-used ones in non-live
+	if [[ ${PV} != 9999 ]]; then
+		local keep=(
+			cpuinfo glad imgui include jpgd lzma simpleini xbyak
+			$(usev vulkan 'glslang vulkan-headers')
+		)
+		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+	fi
+}
+
+src_configure() {
+	use qt6 || setup-wxwidgets
+
+	# for bundled glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DDISABLE_PCSX2_WRAPPER=yes
+		-DDISABLE_SETCAP=yes
+		-DENABLE_TESTS=$(usex test)
+		-DPACKAGE_MODE=yes
+		-DQT_BUILD=$(usex qt6)
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DXDG_STD=yes
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	local replacing_old
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
+	then
+		replacing_old=
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
+		elog "it is recommended to backup your save states and memory cards before use."
+		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+
+	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
+		[[ -v replacing_old ]] && elog
+		elog "${PN}-1.7.x is a development branch using a nightly release model"
+		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
+		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
+		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
+		elog "roughly every months."
+		elog
+		elog "Please report an issue if feel a picked nightly release needs to be"
+		elog "updated ahead of time or masked (notably for handling regressions)."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 00afde986d44..e4673dc1422c 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,108 +1,198 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps git-r3 toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic wxwidgets
 
-DESCRIPTION="A PlayStation 2 emulator"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		vulkan? (
+			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+		)"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=(
-	3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-	3rdparty/imgui/imgui # not made to be system-wide
-	3rdparty/vulkan-headers # to keep in sync with glslang
-)
 
-LICENSE="GPL-3 Apache-2.0 OFL-1.1" # TODO: needs review for a full list
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
+	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-KEYWORDS=""
-IUSE="pulseaudio test"
-
+IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-cpp/rapidyaml:=
-	dev-libs/glib:2
 	dev-libs/libaio
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
-	dev-libs/libxml2:2
 	dev-libs/libzip:=[zstd]
-	media-libs/alsa-lib
 	media-libs/cubeb
-	media-libs/freetype
+	media-libs/harfbuzz
 	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
-	media-libs/libsdl2[haptic,joystick,sound]
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
 	media-libs/libsoundtouch:=
 	net-libs/libpcap
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/libudev:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
 	x11-libs/libX11
-	x11-libs/libXext
 	x11-libs/libXrandr
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	pulseaudio? ( media-sound/pulseaudio )
-"
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		net-misc/curl
+	)
+	!qt6? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		pulseaudio? ( media-libs/libpulse )
+	)
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="test? ( dev-cpp/gtest )"
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	dev-lang/perl
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( sys-devel/gettext )"
 
 FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
 )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
+	"${FILESDIR}"/${PN}-1.7.3329-clang16.patch
+	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
+	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
+	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
+	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
 )
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=()
+		if use vulkan; then
+			EGIT_SUBMODULES+=(
+				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
+				3rdparty/vulkan-headers # to keep in sync with glslang
+			)
+		fi
+		git-r3_src_unpack
+	else
+		default
+		if use vulkan; then
+			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+		fi
+	fi
+}
+
 src_prepare() {
 	cmake_src_prepare
 
-	# unbundle, use sed over patch for less chances to break -9999
-	# note: gentoo's zstd lacks a cmake module which upstream tries to use
-	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
-		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)\nalias_library(chdr-static PkgConfig::chdr)' \
-		-e '/system_library.*zstd/,/endif()/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)\nalias_library(Zstd::Zstd PkgConfig::zstd)' \
-		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
-		-i cmake/SearchForStuff.cmake || die
+	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
+	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
+		-i pcsx2/Frontend/CommonHost.cpp || die
+
+	# pulseaudio is only used for usb-mic and without qt6, not for audio output
+	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
 
-	# pulseaudio is only used for usb-mic, not audio output
-	use pulseaudio || > cmake/FindPulseAudio.cmake || die
+	# GS tests currently fail to build with qt6
+	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
+
+	# delete all 3rdparty/* except known-used ones in non-live
+	if [[ ${PV} != 9999 ]]; then
+		local keep=(
+			cpuinfo glad imgui include jpgd lzma simpleini xbyak
+			$(usev vulkan 'glslang vulkan-headers')
+		)
+		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+	fi
 }
 
 src_configure() {
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
+	use qt6 || setup-wxwidgets
+
+	# for bundled glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
 
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=FALSE
-		-DDISABLE_ADVANCE_SIMD=TRUE
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DDISABLE_SETCAP=TRUE
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DDISABLE_PCSX2_WRAPPER=yes
+		-DDISABLE_SETCAP=yes
 		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=TRUE
-		-DQT_BUILD=FALSE # TODO when qt6 is in tree
-		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
-		-DUSE_SYSTEM_LIBS=TRUE
-		-DUSE_VTUNE=FALSE
-		-DXDG_STD=TRUE
+		-DPACKAGE_MODE=yes
+		-DQT_BUILD=$(usex qt6)
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DXDG_STD=yes
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
 	)
 
-	setup-wxwidgets
 	cmake_src_configure
 }
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	local replacing_old
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
+	then
+		replacing_old=
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
+		elog "it is recommended to backup your save states and memory cards before use."
+		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+
+	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
+		[[ -v replacing_old ]] && elog
+		elog "${PN}-1.7.x is a development branch using a nightly release model"
+		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
+		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
+		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
+		elog "roughly every months."
+		elog
+		elog "Please report an issue if feel a picked nightly release needs to be"
+		elog "updated ahead of time or masked (notably for handling regressions)."
+	fi
+}