From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1601696-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 66CA215808B
for <garchives@archives.gentoo.org>; Sun, 18 Feb 2024 13:23:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9017EE2CA1;
Sun, 18 Feb 2024 13:23:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6E8E5E2B7D
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Feb 2024 13:23:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A33E8343136
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Feb 2024 13:23:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 412D5131B
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Feb 2024 13:23:42 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1708262609.872ebd37dfd70471fdf200f97d8383e26198d33d.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/llvm/llvm-18.1.0_rc2.ebuild sys-devel/llvm/llvm-19.0.0.9999.ebuild sys-devel/llvm/llvm-19.0.0_pre20240210.ebuild
X-VCS-Directories: sys-devel/llvm/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 872ebd37dfd70471fdf200f97d8383e26198d33d
X-VCS-Branch: master
Date: Sun, 18 Feb 2024 13:23:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 419fd69b-e15d-4f56-be21-284da5b0e3a2
X-Archives-Hash: a94ac63bc5d0dad1565cdc38462dca75
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}]"