diff --git a/media-libs/imgui/imgui-1.89.9-r2.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild
similarity index 91%
rename from media-libs/imgui/imgui-1.89.9-r2.ebuild
rename to media-libs/imgui/imgui-1.89.9-r3.ebuild
index 80fab10f6d..17e6f6e5b3 100644
--- a/media-libs/imgui/imgui-1.89.9-r2.ebuild
+++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild
@@ -24,7 +24,10 @@ RDEPEND="
 	media-libs/glew[${MULTILIB_USEDEP}]
 	allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
 	glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
-	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	opengl? ( || (
+		>=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}]
+	) )
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sdl2_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
diff --git a/media-libs/imgui/imgui-1.90.7-r2.ebuild b/media-libs/imgui/imgui-1.90.7-r2.ebuild
new file mode 100644
index 0000000000..17e6f6e5b3
--- /dev/null
+++ b/media-libs/imgui/imgui-1.90.7-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+MESON_WRAP_VER="1"
+
+DESCRIPTION="Bloat-free graphical user interface library for C++"
+HOMEPAGE="
+	https://github.com/ocornut/imgui
+"
+
+SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="opengl vulkan glfw sdl2 sdl3 sdl2_renderer sdl3_renderer webgpu allegro5"
+
+RDEPEND="
+	dev-libs/stb:=
+	media-libs/glew[${MULTILIB_USEDEP}]
+	allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
+	glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
+	opengl? ( || (
+		>=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}]
+	) )
+	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sdl2_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	webgpu? ( dev-util/webgpu-headers )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Use custom meson.build and meson_options.txt to install instead of relay on packages
+	cp "${FILESDIR}/${PN}-meson.build" "${S}/meson.build" || die
+	cp "${FILESDIR}/${PN}-meson_options.txt" "${S}/meson_options.txt" || die
+	sed -i "s/  version: 'PV',/  version: '${PV}',/g" "${S}/meson.build" || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddx9=disabled
+		-Ddx10=disabled
+		-Ddx11=disabled
+		-Ddx12=disabled
+		-Dmetal=disabled
+		$(meson_feature opengl)
+		$(meson_feature vulkan)
+		$(meson_feature glfw)
+		$(meson_feature sdl2)
+		$(meson_feature sdl2_renderer)
+		-Dsdl3=disabled
+		-Dsdl3_renderer=disabled
+		$(meson_feature webgpu)
+		-Dosx=disabled
+		-Dwin=disabled
+		$(meson_feature allegro5)
+	)
+	meson_src_configure
+}