From 8ce2ebdb276ff9fb17da61ecc508536c754c7286 Mon Sep 17 00:00:00 2001
From: Adel KARA SLIMANE <adel.ks@zegrapher.com>
Date: Sat, 28 Dec 2024 02:51:24 +0100
Subject: [PATCH] games-util/mangohud: improve dependencies

Closes: https://bugs.gentoo.org/946925
Closes: https://bugs.gentoo.org/947002

Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>
---
 games-util/mangohud/mangohud-0.7.2-r1.ebuild | 31 ++++++++++----------
 games-util/mangohud/mangohud-9999.ebuild     | 31 ++++++++++----------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/games-util/mangohud/mangohud-0.7.2-r1.ebuild b/games-util/mangohud/mangohud-0.7.2-r1.ebuild
index 568302aad1..307d4ff23d 100644
--- a/games-util/mangohud/mangohud-0.7.2-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.2-r1.ebuild
@@ -55,14 +55,12 @@ BDEPEND="
 
 DEPEND="
 	${PYTHON_DEPS}
-	=media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
-	=media-libs/implot-0.16*[${MULTILIB_USEDEP}]
-	=dev-libs/spdlog-1.13.0*[${MULTILIB_USEDEP}]
-	dev-libs/libfmt[${MULTILIB_USEDEP}]
+	=media-libs/imgui-1.89.9*:=[opengl,vulkan,${MULTILIB_USEDEP}]
+	=media-libs/implot-0.16*:=[${MULTILIB_USEDEP}]
+	dev-libs/spdlog:=[${MULTILIB_USEDEP}]
+	dev-libs/libfmt:=[${MULTILIB_USEDEP}]
 	dev-cpp/nlohmann_json
-	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-	media-libs/libglvnd[${MULTILIB_USEDEP}]
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? (
@@ -72,23 +70,26 @@ DEPEND="
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	mangoapp? (
 		=media-libs/imgui-1.89.9*[glfw]
-		media-libs/glfw[X(+)]
+		media-libs/glfw[X(+)?,wayland(+)?]
 		media-libs/glew
 	)
 "
 
 RDEPEND="
 	${DEPEND}
+	media-libs/libglvnd[${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
 	mangoplot? (
 		media-fonts/lato
 		$(python_gen_cond_dep '
-		|| (
-			dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
-			dev-python/matplotlib[qt5(-),${PYTHON_USEDEP}]
-			dev-python/matplotlib[qt6(-),${PYTHON_USEDEP}]
-			dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		)
-	') )
+			|| (
+				dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
+				dev-python/matplotlib[qt5(-),${PYTHON_USEDEP}]
+				dev-python/matplotlib[qt6(-),${PYTHON_USEDEP}]
+				dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+			)
+		')
+	)
 "
 
 src_unpack() {
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 5d39251e92..79b464829f 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -55,14 +55,12 @@ BDEPEND="
 
 DEPEND="
 	${PYTHON_DEPS}
-	=media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
-	=media-libs/implot-0.16*[${MULTILIB_USEDEP}]
-	=dev-libs/spdlog-1.13.0*[${MULTILIB_USEDEP}]
-	dev-libs/libfmt[${MULTILIB_USEDEP}]
+	=media-libs/imgui-1.89.9*:=[opengl,vulkan,${MULTILIB_USEDEP}]
+	=media-libs/implot-0.16*:=[${MULTILIB_USEDEP}]
+	dev-libs/spdlog:=[${MULTILIB_USEDEP}]
+	dev-libs/libfmt:=[${MULTILIB_USEDEP}]
 	dev-cpp/nlohmann_json
-	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-	media-libs/libglvnd[${MULTILIB_USEDEP}]
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? (
@@ -72,23 +70,26 @@ DEPEND="
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	mangoapp? (
 		=media-libs/imgui-1.89.9*[glfw]
-		media-libs/glfw[X(+)]
+		media-libs/glfw[X(+)?,wayland(+)?]
 		media-libs/glew
 	)
 "
 
 RDEPEND="
 	${DEPEND}
+	media-libs/libglvnd[${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
 	mangoplot? (
 		media-fonts/lato
 		$(python_gen_cond_dep '
-		|| (
-			dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
-			dev-python/matplotlib[qt5(-),${PYTHON_USEDEP}]
-			dev-python/matplotlib[qt6(-),${PYTHON_USEDEP}]
-			dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		)
-	') )
+			|| (
+				dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
+				dev-python/matplotlib[qt5(-),${PYTHON_USEDEP}]
+				dev-python/matplotlib[qt6(-),${PYTHON_USEDEP}]
+				dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+			)
+		')
+	)
 "
 
 src_unpack() {