From b098e9acbc356ebcd4da287828a88bfff7141522 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 11 Oct 2021 00:02:05 +0100 Subject: [PATCH] x11-libs/libdrm: fix missing dev-python/docutils dependency (BDEPEND) May cause issues when e.g. upgrading an older system because Portage doesnt' realise it can't schedule libdrm before the needed Python upgrades. Used for rst2man.py. Signed-off-by: Sam James --- x11-libs/libdrm/libdrm-2.4.107.ebuild | 10 +++++++++- x11-libs/libdrm/libdrm-9999.ebuild | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/x11-libs/libdrm/libdrm-2.4.107.ebuild b/x11-libs/libdrm/libdrm-2.4.107.ebuild index ffadd9d264358..a243fd2cf71d0 100644 --- a/x11-libs/libdrm/libdrm-2.4.107.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.107.ebuild @@ -4,12 +4,13 @@ EAPI=7 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" +PYTHON_COMPAT=( python3_{8..10} ) if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson-multilib +inherit ${GIT_ECLASS} python-any-r1 meson-multilib DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" @@ -34,6 +35,13 @@ RDEPEND=" video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')" + + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} multilib_src_configure() { local emesonargs=( diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild index f603cf7837005..bfedc5805734c 100644 --- a/x11-libs/libdrm/libdrm-9999.ebuild +++ b/x11-libs/libdrm/libdrm-9999.ebuild @@ -4,12 +4,13 @@ EAPI=7 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" +PYTHON_COMPAT=( python3_{8..10} ) if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson-multilib +inherit ${GIT_ECLASS} python-any-r1 meson-multilib DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" @@ -34,6 +35,13 @@ RDEPEND=" video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')" + + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} multilib_src_configure() { local emesonargs=(