commit: f0d4e696f82d989371360d7e4d8df6e2ff1f6bd2
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 07:14:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <arfrever <AT> apache.org>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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
