diff --git a/games-emulation/rpcs3/files/rpcs3-9999-system-zstd.patch b/games-emulation/rpcs3/files/rpcs3-9999-system-zstd.patch
deleted file mode 100644
index 0b8464e720..0000000000
--- a/games-emulation/rpcs3/files/rpcs3-9999-system-zstd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Unbundle zstd.
---- a/3rdparty/CMakeLists.txt
-+++ b/3rdparty/CMakeLists.txt
-@@ -20,7 +20,8 @@ add_library(3rdparty_dummy_lib INTERFACE)
- add_subdirectory(zlib EXCLUDE_FROM_ALL)
- 
- # ZSTD
--add_subdirectory(zstd EXCLUDE_FROM_ALL)
-+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET GLOBAL libzstd)
-+add_library(3rdparty::zstd ALIAS PkgConfig::zstd)
- 
- # 7zip sdk
- add_subdirectory(7zip EXCLUDE_FROM_ALL)
-@@ -350,7 +351,6 @@ else()
- 	add_library(3rdparty::libusb ALIAS usb-1.0-static)
- endif()
- add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
--add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
- add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
- add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
- add_library(3rdparty::pugixml ALIAS pugixml)
diff --git a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
index 10645ed94b..ca6ef0f85a 100644
--- a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
+++ b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -136,11 +136,6 @@ src_prepare() {
 	sed -i -e 's/hid_write_control/hid_write/' \
 		rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
 
-	# Unbundle cubeb
-	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
-	sed -i -e '$afind_package(cubeb)\n' CMakeLists.txt || die
-	sed -i -e 's/3rdparty::cubeb/cubeb/' rpcs3/Emu/CMakeLists.txt || die
-
 	# Unbundle yaml-cpp: system yaml-cpp should be compiled with -fexceptions
 	# sed -i -e '/yaml-cpp/d' 3rdparty/CMakeLists.txt || die
 	# sed -i -e '$afind_package(yaml-cpp)\n' CMakeLists.txt || die
@@ -160,6 +155,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
 		-DUSE_PRECOMPILED_HEADERS=ON
+		-DUSE_SYSTEM_CUBEB=ON
 		-DUSE_SYSTEM_CURL=ON
 		-DUSE_SYSTEM_FFMPEG=ON
 		-DUSE_SYSTEM_FLATBUFFERS=ON
diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 5ca92b3cd2..b315d91920 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -84,7 +84,6 @@ QA_WX_LOAD="usr/share/rpcs3/test/*"
 
 PATCHES=(
 	"${FILESDIR}/${P}-system-stb.patch"
-	"${FILESDIR}/${P}-system-zstd.patch"
 )
 
 src_prepare() {
@@ -129,21 +128,7 @@ src_prepare() {
 	fi
 
 	# Disable automagic ccache
-	sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die
-
-	# Unbundle hidapi
-	sed -i -e '/hidapi\.h/{s:<:<hidapi/:;s/>/>/}' rpcs3/Input/hid_pad_handler.h || die
-	sed -i -e '/hidapi/d' 3rdparty/CMakeLists.txt || die
-	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(hidapi-hidraw REQUIRED hidapi-hidraw)' \
-		rpcs3/CMakeLists.txt || die
-	sed -i -e 's/3rdparty::hidapi/hidapi-hidraw/' rpcs3/CMakeLists.txt rpcs3/rpcs3qt/CMakeLists.txt || die
-	sed -i -e 's/hid_write_control/hid_write/' \
-		rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
-
-	# Unbundle cubeb
-	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
-	sed -i -e '$afind_package(cubeb)\n' CMakeLists.txt || die
-	sed -i -e 's/3rdparty::cubeb/cubeb/' rpcs3/Emu/CMakeLists.txt || die
+	sed -i -e '/find_program(CCACHE_PATH ccache .*)/d' CMakeLists.txt || die
 
 	# Unbundle yaml-cpp: system yaml-cpp should be compiled with -fexceptions
 	# sed -i -e '/yaml-cpp/d' 3rdparty/CMakeLists.txt || die
@@ -151,10 +136,6 @@ src_prepare() {
 	# sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \
 	#	rpcs3/rpcs3qt/CMakeLists.txt || die
 
-	# Fix build with GCC 15
-	# https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd
-	sed -i '/<algorithm>/a#include <cstdint>' 3rdparty/glslang/glslang/SPIRV/SpvBuilder.h || die
-
 	cmake_src_prepare
 }
 
@@ -164,13 +145,16 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
 		-DUSE_PRECOMPILED_HEADERS=ON
+		-DUSE_SYSTEM_CUBEB=ON
 		-DUSE_SYSTEM_CURL=ON
 		-DUSE_SYSTEM_FFMPEG=ON
 		-DUSE_SYSTEM_FLATBUFFERS=ON
+		-DUSE_SYSTEM_HIDAPI=ON
 		-DUSE_SYSTEM_LIBPNG=ON
 		-DUSE_SYSTEM_LIBUSB=ON
 		-DUSE_SYSTEM_PUGIXML=ON
 		-DUSE_SYSTEM_ZLIB=ON
+		-DUSE_SYSTEM_ZSTD=ON
 		-DUSE_DISCORD_RPC=$(usex discord)
 		-DUSE_FAUDIO=$(usex faudio)
 		-DUSE_SYSTEM_OPENCV=$(usex opencv)
@@ -197,4 +181,4 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "FeralInteractive GameMode support" games-util/gamemode
-}
\ No newline at end of file
+}