From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id C0ABA1582EF for ; Tue, 11 Mar 2025 07:54:09 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9175834314A for ; Tue, 11 Mar 2025 07:54:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CD4A91103CB; Tue, 11 Mar 2025 07:54:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id C33381103C8 for ; Tue, 11 Mar 2025 07:54:04 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49E31343118 for ; Tue, 11 Mar 2025 07:54:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7670628CC for ; Tue, 11 Mar 2025 07:54:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741679610.147f4e2aa92fc575baeb768acf4e7083cf2ec0a2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild X-VCS-Directories: dev-ada/gnatcoll-core/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 147f4e2aa92fc575baeb768acf4e7083cf2ec0a2 X-VCS-Branch: master Date: Tue, 11 Mar 2025 07:54:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 60e99de7-27c0-4dc2-b599-4bb8f2d5b88f X-Archives-Hash: eaee5e250eb78280a21468a1c2c23722 commit: 147f4e2aa92fc575baeb768acf4e7083cf2ec0a2 Author: Sam James gentoo org> AuthorDate: Tue Mar 11 03:55:11 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 11 07:53:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147f4e2a dev-ada/gnatcoll-core: fixup python_check_deps With USE="-doc test", if we have dev-ada/e3-testsuite installed but not dev-python/sphinx, we end up failing because we don't return early if *ONLY* USE=test and end up looking for doc deps. Feel like I'm missing a more elegant way of doing this (other than relying on just the implicit return which doesnt't simplify much) but let's get it fixed in any case. Bug: https://bugs.gentoo.org/951067 Signed-off-by: Sam James gentoo.org> dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild index 0694b04c8e71..19391f8e7294 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild @@ -36,11 +36,22 @@ BDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) python_check_deps() { - if use test; then + if use doc && use test ; then + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" && python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]" || return 1 - fi; - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" + + return 0 + elif use test; then + python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]" || return 1 + + return 0 + elif use doc; then + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" || return 1 + fi + + return 0 } pkg_setup() {