commit: 190c795ad50da68978ea7b621926213196b2cf11
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Mon Nov 27 22:04:04 2023 +0000
Commit: Adel KARA SLIMANE <adel <AT> karaslimane <DOT> com>
CommitDate: Mon Nov 27 22:13:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=190c795a
games-util/mangohud: fix python eclass use
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/mangohud-0.7.0.ebuild | 34 +++++++++++++------------------
games-util/mangohud/mangohud-9999.ebuild | 34 +++++++++++++------------------
2 files changed, 28 insertions(+), 40 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.0.ebuild
b/games-util/mangohud/mangohud-0.7.0.ebuild
index 8b15d25e4d..f257c749b7 100644
--- a/games-util/mangohud/mangohud-0.7.0.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-any-r1 meson
+inherit python-single-r1 meson
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -40,22 +40,18 @@ SLOT="0"
IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
|| ( X wayland )
- xnvctrl? ( video_cards_nvidia )"
+ xnvctrl? ( video_cards_nvidia )
+"
BDEPEND="
app-arch/unzip
- $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')
"
-python_check_deps() {
- python_has_version "dev-python/mako[${PYTHON_USEDEP}]" ||
- python_has_version "dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]" ||
- python_has_version "dev-python/matplotlib[qt5,${PYTHON_USEDEP}]" ||
- python_has_version "dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]"
-}
-
-DEPEND="
+RDEPEND="
+ ${PYTHON_DEPS}
~media-libs/imgui-1.81[opengl,vulkan]
dev-cpp/nlohmann_json
dev-libs/spdlog
@@ -71,17 +67,15 @@ DEPEND="
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
wayland? ( dev-libs/wayland )
- || (
- $(python_gen_any_dep '
-
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
-
dev-python/matplotlib[qt5,${PYTHON_USEDEP}]
-
dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
- ')
- )
+ $(python_gen_cond_dep '
+ || (
+ dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
+ dev-python/matplotlib[qt5,${PYTHON_USEDEP}]
+ dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+ )
+ ')
"
-RDEPEND="${DEPEND}"
-
PATCHES=(
"${FILESDIR}/mangohud-v0.7.0-meson-fix-imgui-dep.patch"
"${FILESDIR}/mangohud-v0.7.0-imgui-include-fix.patch"
diff --git a/games-util/mangohud/mangohud-9999.ebuild
b/games-util/mangohud/mangohud-9999.ebuild
index 7632ae6556..d68169da01 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-any-r1 meson
+inherit python-single-r1 meson
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -47,22 +47,18 @@ SLOT="0"
IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
|| ( X wayland )
- xnvctrl? ( video_cards_nvidia )"
+ xnvctrl? ( video_cards_nvidia )
+"
BDEPEND="
app-arch/unzip
- $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]')
"
-python_check_deps() {
- python_has_version "dev-python/mako[${PYTHON_USEDEP}]" ||
- python_has_version "dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]" ||
- python_has_version "dev-python/matplotlib[qt5,${PYTHON_USEDEP}]" ||
- python_has_version "dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]"
-}
-
-DEPEND="
+RDEPEND="
+ ${PYTHON_DEPS}
~media-libs/imgui-1.81[opengl,vulkan]
dev-cpp/nlohmann_json
dev-libs/spdlog
@@ -78,17 +74,15 @@ DEPEND="
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
wayland? ( dev-libs/wayland )
- || (
- $(python_gen_any_dep '
-
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
-
dev-python/matplotlib[qt5,${PYTHON_USEDEP}]
-
dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
- ')
- )
+ $(python_gen_cond_dep '
+ || (
+ dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
+ dev-python/matplotlib[qt5,${PYTHON_USEDEP}]
+ dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+ )
+ ')
"
-RDEPEND="${DEPEND}"
-
PATCHES=(
"${FILESDIR}/mangohud-v0.7.0-meson-fix-imgui-dep.patch"
"${FILESDIR}/mangohud-v0.7.0-imgui-include-fix.patch"
