diff --git a/media-libs/mesa/mesa-23.1.8.ebuild b/media-libs/mesa/mesa-23.1.8.ebuild
index 560736a0b1ec7..ce529ff6c2385 100644
--- a/media-libs/mesa/mesa-23.1.8.ebuild
+++ b/media-libs/mesa/mesa-23.1.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -414,6 +414,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.1.9.ebuild b/media-libs/mesa/mesa-23.1.9.ebuild
index 62c41be4b4a7a..c87b81ad5ef7b 100644
--- a/media-libs/mesa/mesa-23.1.9.ebuild
+++ b/media-libs/mesa/mesa-23.1.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -421,6 +421,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.2.1.ebuild b/media-libs/mesa/mesa-23.2.1.ebuild
index 870f9c7bb7971..8c5c1dd2d7fba 100644
--- a/media-libs/mesa/mesa-23.2.1.ebuild
+++ b/media-libs/mesa/mesa-23.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -419,6 +419,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.3.0.ebuild b/media-libs/mesa/mesa-23.3.0.ebuild
index d1680c5b7dd70..99b45b540f6ca 100644
--- a/media-libs/mesa/mesa-23.3.0.ebuild
+++ b/media-libs/mesa/mesa-23.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -396,6 +396,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.3.0_rc5-r1.ebuild b/media-libs/mesa/mesa-23.3.0_rc5-r1.ebuild
index d1680c5b7dd70..99b45b540f6ca 100644
--- a/media-libs/mesa/mesa-23.3.0_rc5-r1.ebuild
+++ b/media-libs/mesa/mesa-23.3.0_rc5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -396,6 +396,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.3.1.ebuild b/media-libs/mesa/mesa-23.3.1.ebuild
index 05661fcb02726..0ca8822bb7bad 100644
--- a/media-libs/mesa/mesa-23.3.1.ebuild
+++ b/media-libs/mesa/mesa-23.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -400,6 +400,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.3.2.ebuild b/media-libs/mesa/mesa-23.3.2.ebuild
index 6f6fd277f6285..015ace3a31c5a 100644
--- a/media-libs/mesa/mesa-23.3.2.ebuild
+++ b/media-libs/mesa/mesa-23.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -396,6 +396,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.3.3.ebuild b/media-libs/mesa/mesa-23.3.3.ebuild
index 7add5959b1cbc..2bae839238259 100644
--- a/media-libs/mesa/mesa-23.3.3.ebuild
+++ b/media-libs/mesa/mesa-23.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -401,6 +401,9 @@ multilib_src_configure() {
 		emesonargs+=(-Dintel-clc=disabled)
 	fi
 
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)