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 60F9F15800F for ; Fri, 17 Feb 2023 09:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 205C9E0894; Fri, 17 Feb 2023 09:12:41 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07DCBE0894 for ; Fri, 17 Feb 2023 09:12:41 +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 EB605341106 for ; Fri, 17 Feb 2023 09:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35AAA8B1 for ; Fri, 17 Feb 2023 09:12:38 +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: <1676625123.f0d4e696f82d989371360d7e4d8df6e2ff1f6bd2.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/ X-VCS-Repository: proj/portage X-VCS-Files: bin/install-qa-check.d/60pkgconfig X-VCS-Directories: bin/install-qa-check.d/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f0d4e696f82d989371360d7e4d8df6e2ff1f6bd2 X-VCS-Branch: master Date: Fri, 17 Feb 2023 09:12:38 +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: efe27f2a-8197-4185-8257-5feff117a076 X-Archives-Hash: 9110b5c58ac789da618d0f1d14a38460 commit: f0d4e696f82d989371360d7e4d8df6e2ff1f6bd2 Author: Florian Schmaus gentoo org> AuthorDate: Mon Aug 15 07:14:14 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 17 09:12:03 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0d4e696 install-qa-check.d/60pkgconfig: conditionally source eapi7-ver-funcs.sh To make ver_test available, source eapi7-ver-funcs.sh instead of inherting eapi7-ver. This makes the check available for ebuild repositories that do not have ::gentoo as main repository. Suggested-by: Arfrever Frehtes Taifersar Arahesis apache.org> Signed-off-by: Florian Schmaus gentoo.org> Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/60pkgconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/install-qa-check.d/60pkgconfig b/bin/install-qa-check.d/60pkgconfig index 6ecbcabfd..5d5b6d611 100644 --- a/bin/install-qa-check.d/60pkgconfig +++ b/bin/install-qa-check.d/60pkgconfig @@ -1,5 +1,10 @@ # Check for pkg-config file issues +# Ensure that ver_test is available. +if ! __eapi_has_version_functions; then + source "${PORTAGE_BIN_PATH}/eapi7-ver-funcs.sh" || exit 1 +fi + pkgconfig_check() { local files=() # Make a list of .pc files and bail out if there aren't any @@ -108,8 +113,6 @@ pkgconfig_check() { local is_pms_ver=false if [[ ${QA_PKGCONFIG_VERSION} =~ ${pms_ver_re} ]] ; then - # Ensure that ver_test is available. - [[ $(type -t ver_test) == function ]] || inherit eapi7-ver is_pms_ver=true fi