4 files changed, 175 insertions, 49 deletions
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ab8bcd309ad4..493303cac693 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -9,12 +9,14 @@ AUX pcsx2-1.7.4667-system-zstd.patch 528 BLAKE2B 5539f8de26ee029d95199f3da1e5eea
 AUX pcsx2-1.7.4795-rapidyaml-0.5.patch 323 BLAKE2B 1ddc927ea824793997d0fb371caa8da1db2315c0ba7205e88cc3fb405a29e00025e074a447da381ad93924f3e85f4565534d2e7b957cb43a3d9cf1b2e41a51fd SHA512 04de3ca3ee0a69c283e6a59420dd67aa77fea083607366bac7cab7ea4be1cb6207dd3d78e3179c7de6e802c8607b275d64ec4ca3f57037e27745c732a1e231d4
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
+DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B 88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89 SHA512 991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
 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-1.7.4940.ebuild 8550 BLAKE2B 759f089819ba78b833e8be2c2a6352fe58ed49f130c3141d26b995c89d8bac3d1af646829ca253265620541934a6dc812a96890252649c3d3362741744f666f3 SHA512 783d8db763ec1d6d960e60788aca11f2abe6ae4d12ff272edbb3e1f47e481fbb845a0d1e5435c67fe0466e70c88f8e3d284cd0cc62bb47f72dd7e5efd618bf0f
-EBUILD pcsx2-9999.ebuild 5081 BLAKE2B ef7315760d11fa199ad45b241fcacb1791d6ed371ef88d33c492b104bf1349f2b89f6938de9b45f7b68ab6cfea43a63c16d0a3c80cb72789ca81dcaa66437d93 SHA512 ceefae9bb49391f62c0fa6ddfbd1db23a321adfcf74f4d74d07d796c5e384e8368940aa0ecc3d809235f6c8436971ac453d1c0d14df2c4047821bc7dab3ffae0
+EBUILD pcsx2-1.7.4940-r1.ebuild 8563 BLAKE2B abe7ff5e05e0581962e52a2a2965f595751aaf33e9db5fc2580d679ffe6004846143ff9b7dc366c251c6a2d4675018b5bef131880e234ca3375b10012c952c54 SHA512 3459ced36ed374c4db5a9c3715e3c7ba6c092998b9a5628dcb054b4ed34401b3e37798b40c28b27fe09e68a61dbda7da6832e658f19d59950811f62e2df80022
+EBUILD pcsx2-1.7.5033.ebuild 4144 BLAKE2B 8c74f5ca60dc1e1e54db7c65582621922634917a4e3ad3a7c6935984420389276456969cbca876a8d501ee26f6e39d4d899ea3aa5de5f35c33ae85eccad41bfc SHA512 557c2ea2d6861dcf4cf09d7cc1c5f7ad12d573bd3e47f82bde4880c96b862351b177efda71d39eb427b4da0af70c92a4433f3273d471b34282ca41dc2215c922
+EBUILD pcsx2-9999.ebuild 4144 BLAKE2B 8c74f5ca60dc1e1e54db7c65582621922634917a4e3ad3a7c6935984420389276456969cbca876a8d501ee26f6e39d4d899ea3aa5de5f35c33ae85eccad41bfc SHA512 557c2ea2d6861dcf4cf09d7cc1c5f7ad12d573bd3e47f82bde4880c96b862351b177efda71d39eb427b4da0af70c92a4433f3273d471b34282ca41dc2215c922
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
index 6089f51c3411..4976851a41d4 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
@@ -75,7 +75,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	games-emulation/pcsx2_patches
+	<games-emulation/pcsx2_patches-0_p20230917
 "
 DEPEND="
 	${COMMON_DEPEND}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
new file mode 100644
index 000000000000..98a2f8f00c10
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+	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 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libaio
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.2[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	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_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+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
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DX11_API=yes # X libs are currently hard-required either way
+
+		# 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
+
+		# not packaged due to bug #885471, but still disable for no automagic
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=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() {
+	insinto /usr/lib/${PN}
+	doins -r "${BUILD_DIR}"/bin/.
+
+	fperms +x /usr/lib/${PN}/pcsx2-qt
+	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
+
+	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^^}
+
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+
+	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
+}
+
+pkg_postinst() {
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
+
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
+		elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
+		elog "to backup configs, save states, and memory cards before using."
+		elog
+		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index bb34c0a768df..98a2f8f00c10 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -55,7 +55,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	games-emulation/pcsx2_patches
+	>=games-emulation/pcsx2_patches-0_p20230917
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -69,10 +69,6 @@ BDEPEND="
 	)
 "
 
-FILECAPS=(
-	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
@@ -82,9 +78,6 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
-	sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
-		-i pcsx2/Pcsx2Config.cpp || die
-
 	if [[ ${PV} != 9999 ]]; then
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
@@ -134,53 +127,29 @@ src_test() {
 }
 
 src_install() {
-	newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
-
-	insinto /usr/share/${PN}
-	doins -r "${BUILD_DIR}"/bin/resources
+	insinto /usr/lib/${PN}
+	doins -r "${BUILD_DIR}"/bin/.
 
-	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+	fperms +x /usr/lib/${PN}/pcsx2-qt
+	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
 
 	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
 	make_desktop_entry ${PN} ${PN^^}
+
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+
+	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
 }
 
 pkg_postinst() {
-	fcaps_pkg_postinst
-
-	local replacing=
-	if [[ ${REPLACING_VERSIONS##* } ]]; then
-		if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then
-			replacing=old
-		elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then
-			replacing=wx
-		else
-			replacing=any
-		fi
-	fi
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
 
-	if [[ ${replacing} == old ]]; then
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
+		elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
+		elog "to backup configs, save states, and memory cards before using."
 		elog
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, notably"
-		elog "it is now a 64bit build using Qt6. Just-in-case it is recommended to"
-		elog "backup your configs, save states, and memory cards before use."
 		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
 	fi
-
-	if [[ ${replacing} == @(|old) && ${PV} != 9999 ]]; then
-		elog
-		elog "${PN}-1.7.x is a development branch where .x increments every changes."
-		elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native"
-		elog "64bit builds). Given it may be a long time before there is a new stable,"
-		elog "Gentoo will carry and update 1.7.x roughly every months."
-		elog
-		elog "Please report an issue if feel a picked version needs to be updated ahead"
-		elog "of time or masked (notably for handling regressions)."
-	fi
-
-	if [[ ${replacing} == wx ]]; then
-		ewarn
-		ewarn "Note that wxGTK support been dropped upstream since >=${PN}-1.7.3773,"
-		ewarn "and so USE=qt6 is gone and Qt6 is now always used."
-	fi
 }