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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2FD321382C5 for ; Thu, 7 Jan 2021 00:27:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE757E0876; Thu, 7 Jan 2021 00:27:44 +0000 (UTC) Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 523FFE0872 for ; Thu, 7 Jan 2021 00:27:44 +0000 (UTC) Received: by mail-qk1-f169.google.com with SMTP id b64so4179658qkc.12 for ; Wed, 06 Jan 2021 16:27:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bYYRBgbFgRHC/b6psmI/06JmvF9MweJ90y2vrAWIAIw=; b=UYS2r2VHWycI99BjOY/zHOJPtlvrQhrMgv76wINkwVAkmazDNQLwc90JJngfR/h8H9 x2hfIfUl8xs/OMdKXAAr6v9VSbk2YwR5jOsBw8A7XJQy0n6bYgX0YbBW1u5HJMAh2lvm +CnW0KE/uC51Q4+QA2RP4afOnb/nLWkBE2F6jtmtryRC7X1ZG0p9HO1ixS2k6V2iY21r xSq+hRL9qXsz3Ay4rVYMw03zP7SzawOCTNdmnJkf3updSSe1yQKCS1n3DHHCVbUHzgs2 eKe6h4pWyWjDtvXNGMV18ypXgoSrfXP6zaNGmqdqjHpwKdhlsV4YAjT4sBfLAxD5jj/V 9SOA== X-Gm-Message-State: AOAM530SyJWPDOYc9bSidQOab7qGXWJM12hED/LENpq+dEveFXSqg6lB n1+Q3IqDewf5VZ3GlSRj1FIPElzp/BU= X-Google-Smtp-Source: ABdhPJykNQBGrLabbYK98AzVopiyowRlOk7zJFatsHGOaMsXO0TKSF2sD4NhqrD/D9L3lMaQEjD6nA== X-Received: by 2002:a37:9d96:: with SMTP id g144mr6646545qke.441.1609979263144; Wed, 06 Jan 2021 16:27:43 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id 14sm2381006qkv.25.2021.01.06.16.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jan 2021 16:27:42 -0800 (PST) From: Matt Turner To: gentoo-dev@lists.gentoo.org Cc: David Michael , Matt Turner Subject: [gentoo-dev] [PATCH] vala.eclass: make has_version aware of ROOT for EAPI 7 Date: Wed, 6 Jan 2021 19:27:35 -0500 Message-Id: <20210107002735.538780-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: f205e168-dfb4-428c-bd4f-279b4084ec1e X-Archives-Hash: a3aac2867c798a3c3e4b9bbf779a7029 From: David Michael The vala dependencies are declared in BDEPEND since EAPI 7 so that the valac command is natively executable. With no arguments, the has_version function would look for a cross-compiled vala package in the target ROOT and always fail. Signed-off-by: David Michael Signed-off-by: Matt Turner --- eclass/vala.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/vala.eclass b/eclass/vala.eclass index 52899f163dc..88c5231286a 100644 --- a/eclass/vala.eclass +++ b/eclass/vala.eclass @@ -102,7 +102,7 @@ vala_best_api_version() { u=$(_vala_use_depend) for v in $(vala_api_versions); do - has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return + has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-lang/vala:${v}${u}" && echo "${v}" && return done } @@ -136,7 +136,7 @@ vala_src_prepare() { fi if [[ ${version} ]]; then - has_version "dev-lang/vala:${version}" || die "No installed vala:${version}" + has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-lang/vala:${version}" || die "No installed vala:${version}" else version=$(vala_best_api_version) [[ ${version} ]] || die "No installed vala in $(vala_depend)" -- 2.26.2