diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 47e50a51a2549..0f3caef4fded2 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1,3 @@
 DIST waffle-v1.8.1.tar.bz2 309259 BLAKE2B bfc4cd9043df854e34ab0ee0edd7d231fbc2253e41de8eb3bb702428a2b22569a407dc595a4c13a1a5e7cac2686dfe8b4ec26397e3dbed1a433de31fd3616b4f SHA512 c0e47047776de9cc20791974dec0944c769d766e5fe4f4e66a25a0d5900f3a756d95b4df434ff2e595079659d79d95398f6f411e4b8cc969cace7b2c3532b79f
 DIST waffle-v1.8.2.tar.bz2 309343 BLAKE2B b28a0f3a8f9b38422bf0407b16c49db5860f7db179daae2f35dcc18ab4d7bf2975a1687e14ad428435d99bec376780435443cfffbd741e0e3a41894aa6a106a6 SHA512 78f57bd87b83e02e389f98ecdddaf65cb3f68409c6b93ea3545f312ae683088474bc9294da04dbcafbcbcc5f6745f368882e4bc635f27c008014d9459f502a9f
+DIST waffle-v1.8.3.tar.bz2 309655 BLAKE2B 549eaf78c3cb84ba22432730cc66303f21a1293ad5f92f1b1ac6535c0235f7eee2bec9aeb39240e387761c75649808d8cedbd06f82698235c3e7ccf9ffb36d68 SHA512 a6b7d5e4e98e35582a655f8a3b687200b3c7ddb724dec6e14fa3e64b56c3f238986f09397b06bd0fc958facd7cee534c6758dec69670c600368d57ccf69f9431
diff --git a/media-libs/waffle/waffle-1.8.3.ebuild b/media-libs/waffle/waffle-1.8.3.ebuild
new file mode 100644
index 0000000000000..644b35597d532
--- /dev/null
+++ b/media-libs/waffle/waffle-1.8.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson-multilib multilib virtualx ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc test wayland X"
+RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under sandbox
+
+RDEPEND="
+	>=media-libs/mesa-23[${MULTILIB_USEDEP}]
+	>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	wayland? ( dev-libs/wayland-protocols )
+	X? ( >=x11-base/xcb-proto-1.8-r3 )
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/wayland-scanner
+"
+#	test? (
+#		wayland? ( dev-libs/weston[headless] )
+#	)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		-Dgbm=enabled
+		-Dsurfaceless_egl=enabled
+
+		$(meson_use test build-tests)
+		$(meson_native_true build-manpages)
+		-Dbuild-htmldocs=false
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	addwrite /dev/dri/
+
+	if use wayland; then
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-6
+	fi
+
+	export MESA_SHADER_CACHE_DISABLE=true
+	virtx meson_src_test
+
+	if use wayland; then
+		kill ${compositor}
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	rm -r \
+		"${ED}"/usr/share/doc/${P} \
+		"${ED}"/usr/share/doc/waffle1/release-notes || die
+	mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+	if ! use doc; then
+		rm -rf \
+			"${ED}"/usr/share/man/man{3,7} || die
+	fi
+}