[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     201d1186659a9318aaba687b6985fb667bcf392f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 14:25:46 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 14:26:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201d1186

llvm.org.eclass: Fix manpage logic

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/llvm.org.eclass | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 1af8f12f63dc..f69db2368dff 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -229,9 +229,7 @@ llvm.org_set_globals() {
        if [[ ${LLVM_MANPAGES} ]]; then
                # use pregenerated tarball for releases
                # up to _LLVM_NEWEST_MANPAGE_RELEASE
-               if [[ ${_LLVM_SOURCE_TYPE} == tar ]] &&
-                       ver_test "${PV}" -le "${_LLVM_NEWEST_MANPAGE_RELEASE}"
-               then
+               if llvm_manpage_dist_available; then
                        IUSE+=" doc"
                        SRC_URI+="
                                !doc? (
@@ -394,12 +392,13 @@ get_lit_flags() {
        echo "-vv;-j;${LIT_JOBS:-$(makeopts_jobs)}"
 }
 
-# @FUNCTION: llvm_are_manpages_built
+# @FUNCTION: llvm_manpage_dist_available
 # @DESCRIPTION:
-# Return true (0) if manpages are going to be built from source,
-# false (1) if preinstalled manpages will be used.
-llvm_are_manpages_built() {
-       use doc || [[ ${LLVM_MANPAGES} == build ]]
+# Return true (0) if this LLVM version features prebuilt manpage
+# tarball, false (1) otherwise.
+llvm_manpage_dist_available() {
+       [[ ${_LLVM_SOURCE_TYPE} == tar ]] &&
+               ver_test "${PV}" -le "${_LLVM_NEWEST_MANPAGE_RELEASE}"
 }
 
 # @FUNCTION: llvm_install_manpages
@@ -407,7 +406,7 @@ llvm_are_manpages_built() {
 # Install pregenerated manpages if available.  No-op otherwise.
 llvm_install_manpages() {
        # install pre-generated manpages
-       if ! llvm_are_manpages_built; then
+       if ! use doc && llvm_manpage_dist_available; then
                # (doman does not support custom paths)
                insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
                doins "${WORKDIR}/llvm-${PV}-manpages/${LLVM_COMPONENTS[0]}"/*.1