commit: 872ebd37dfd70471fdf200f97d8383e26198d33d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 17 19:34:26 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Feb 18 13:23:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872ebd37
sys-devel/llvm: Fix myst-parser dep for manpage builds in 18+ Closes: https://bugs.gentoo.org/924706 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-devel/llvm/llvm-18.1.0_rc2.ebuild | 15 ++++++++++----- sys-devel/llvm/llvm-19.0.0.9999.ebuild | 15 ++++++++++----- sys-devel/llvm/llvm-19.0.0_pre20240210.ebuild | 15 ++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/sys-devel/llvm/llvm-18.1.0_rc2.ebuild b/sys-devel/llvm/llvm-18.1.0_rc2.ebuild index 8ff126c7d4a1..55ced7c14db1 100644 --- a/sys-devel/llvm/llvm-18.1.0_rc2.ebuild +++ b/sys-devel/llvm/llvm-18.1.0_rc2.ebuild @@ -50,10 +50,6 @@ BDEPEND=" kernel_Darwin? ( <sys-libs/libcxx-${LLVM_VERSION}.9999 ) - doc? ( $(python_gen_any_dep ' - dev-python/myst-parser[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) libffi? ( virtual/pkgconfig ) " # There are no file collisions between these versions but having :0 @@ -73,8 +69,17 @@ LLVM_MANPAGES=1 LLVM_USE_TARGETS=provide llvm.org_set_globals +[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( " +BDEPEND+=" + $(python_gen_any_dep ' + dev-python/myst-parser[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + ') +" +[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) " + python_check_deps() { - use doc || return 0 + llvm_are_manpages_built || return 0 python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" && python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" diff --git a/sys-devel/llvm/llvm-19.0.0.9999.ebuild b/sys-devel/llvm/llvm-19.0.0.9999.ebuild index 8ff126c7d4a1..55ced7c14db1 100644 --- a/sys-devel/llvm/llvm-19.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-19.0.0.9999.ebuild @@ -50,10 +50,6 @@ BDEPEND=" kernel_Darwin? ( <sys-libs/libcxx-${LLVM_VERSION}.9999 ) - doc? ( $(python_gen_any_dep ' - dev-python/myst-parser[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) libffi? ( virtual/pkgconfig ) " # There are no file collisions between these versions but having :0 @@ -73,8 +69,17 @@ LLVM_MANPAGES=1 LLVM_USE_TARGETS=provide llvm.org_set_globals +[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( " +BDEPEND+=" + $(python_gen_any_dep ' + dev-python/myst-parser[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + ') +" +[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) " + python_check_deps() { - use doc || return 0 + llvm_are_manpages_built || return 0 python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" && python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240210.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240210.ebuild index 8ff126c7d4a1..55ced7c14db1 100644 --- a/sys-devel/llvm/llvm-19.0.0_pre20240210.ebuild +++ b/sys-devel/llvm/llvm-19.0.0_pre20240210.ebuild @@ -50,10 +50,6 @@ BDEPEND=" kernel_Darwin? ( <sys-libs/libcxx-${LLVM_VERSION}.9999 ) - doc? ( $(python_gen_any_dep ' - dev-python/myst-parser[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) libffi? ( virtual/pkgconfig ) " # There are no file collisions between these versions but having :0 @@ -73,8 +69,17 @@ LLVM_MANPAGES=1 LLVM_USE_TARGETS=provide llvm.org_set_globals +[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( " +BDEPEND+=" + $(python_gen_any_dep ' + dev-python/myst-parser[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + ') +" +[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) " + python_check_deps() { - use doc || return 0 + llvm_are_manpages_built || return 0 python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" && python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
