diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index f19ad20af8fd9..c28fee7aa1efe 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib.eclass
@@ -552,10 +552,10 @@ multilib_toolchain_setup() {
 		export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip'
 
 		export CHOST=$(get_abi_CHOST $1)
-		export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
-		export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
-		export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include
-		export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)
+		export PKG_CONFIG_LIBDIR=${ESYSROOT}/usr/$(get_libdir)/pkgconfig
+		export PKG_CONFIG_PATH=${ESYSROOT}/usr/share/pkgconfig
+		export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${ESYSROOT}/usr/include
+		export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${ESYSROOT}/$(get_libdir):${ESYSROOT}/usr/$(get_libdir)
 	fi
 }
 
diff --git a/gui-wm/gamescope/files/gamescope-libdisplay-info-0.3.0.patch b/gui-wm/gamescope/files/gamescope-libdisplay-info-0.3.0.patch
new file mode 100644
index 0000000000000..a70527dc6a8af
--- /dev/null
+++ b/gui-wm/gamescope/files/gamescope-libdisplay-info-0.3.0.patch
@@ -0,0 +1,19 @@
+From 13e56464c86c6abb0c6a2c2785d473c6528a6488 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 15 Aug 2025 23:17:59 +0100
+Subject: [PATCH] subprojects: Bump libdisplay-info to 0.3.0
+
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -33,7 +33,7 @@ wlroots_dep = dependency(
+ 
+ displayinfo_dep = dependency(
+   'libdisplay-info',
+-  version: ['>= 0.0.0', '< 0.3.0'],
++  version: ['>= 0.0.0', '< 0.4.0'],
+   fallback: ['libdisplay-info', 'di_dep'],
+   default_options: ['default_library=static'],
+ )
+-- 
+2.50.1
+
diff --git a/gui-wm/gamescope/gamescope-3.16.15.ebuild b/gui-wm/gamescope/gamescope-3.16.15-r1.ebuild
similarity index 98%
rename from gui-wm/gamescope/gamescope-3.16.15.ebuild
rename to gui-wm/gamescope/gamescope-3.16.15-r1.ebuild
index f675287227436..e3bdabc4b43ee 100644
--- a/gui-wm/gamescope/gamescope-3.16.15.ebuild
+++ b/gui-wm/gamescope/gamescope-3.16.15-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	>=dev-libs/libinput-1.14.0:=
 	>=dev-libs/wayland-1.23.1
 	gui-libs/libdecor
-	<media-libs/libdisplay-info-0.3:=
+	<media-libs/libdisplay-info-0.4:=
 	media-libs/vulkan-loader
 	sys-apps/hwdata
 	sys-libs/libcap
@@ -97,6 +97,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-deprecated-stb.patch
 	"${FILESDIR}"/${PN}-subprojects.patch
+	"${FILESDIR}"/${PN}-libdisplay-info-0.3.0.patch
 )
 
 FILECAPS=(