From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 4455C15817D for ; Fri, 14 Jun 2024 12:26:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 594692BC03F; Fri, 14 Jun 2024 12:26:29 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 1A0912BC03E for ; Fri, 14 Jun 2024 12:26:29 +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 35B29335D6B for ; Fri, 14 Jun 2024 12:26:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AEA71CEE for ; Fri, 14 Jun 2024 12:26:25 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1718367970.8c7703e917f8ff61c4fa7881ef664eb9054c23d6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8c7703e917f8ff61c4fa7881ef664eb9054c23d6 X-VCS-Branch: master Date: Fri, 14 Jun 2024 12:26:25 +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: 1e25c4a5-e68a-4a31-bb7b-8f97e30dfbde X-Archives-Hash: 17c492e6a244ab4de106e3a71a907048 commit: 8c7703e917f8ff61c4fa7881ef664eb9054c23d6 Author: Michał Górny gentoo org> AuthorDate: Mon Jun 10 18:58:16 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 14 12:26:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7703e9 python-r1.eclass: Override PYTHON*_USEDEP in sub-phases Override the value of PYTHON_USEDEP and PYTHON_SINGLE_USEDEP to match the current implementation inside sub-phase function. This makes it possible to use them in has_version checks with conditional dependencies. Signed-off-by: Michał Górny gentoo.org> eclass/python-r1.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index fbc6082a1d92..c5fa6770558f 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-r1.eclass @@ -594,6 +594,8 @@ _python_multibuild_wrapper() { local -x EPYTHON PYTHON local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} + local PYTHON_USEDEP="python_targets_${MULTIBUILD_VARIANT}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${MULTIBUILD_VARIANT}(-)" _python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON _python_wrapper_setup