[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8138f63798688fd1a8c3e00ba23a21397daf08bf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 21:33:24 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 16:54:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8138f637

qt5-build.eclass: Introduce QT5_PV for intra-dev-qt deps

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 988dceb495f..0cc45c596b3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -37,6 +37,12 @@ readonly QT5_BUILD_TYPE
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
+# @ECLASS-VARIABLE: QT5_PV
+# @DESCRIPTION:
+# 3-component version for use in dependency declarations on other dev-qt/ pkgs.
+QT5_PV=$(ver_cut 1-3)
+readonly QT5_PV
+
 # @ECLASS-VARIABLE: _QT5_P
 # @INTERNAL
 # @DESCRIPTION:
@@ -109,7 +115,7 @@ BDEPEND="
        virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
-       DEPEND+=" test? ( ~dev-qt/qttest-$(ver_cut 1-3) )"
+       DEPEND+=" test? ( =dev-qt/qttest-${QT5_PV}* )"
 fi
 
 ######  Phase functions  ######
@@ -127,7 +133,7 @@ qt5-build_src_prepare() {
                # 5.15.3 release is closed and this will never be more than a 
Qt 5.15.2
                # with patches on top.
                einfo "Preparing KDE Qt5PatchCollection snapshot at 
${KDE_ORG_COMMIT}"
-               sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf 
|| die
+               sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i 
.qmake.conf || die
                mkdir -p .git || die # need to fake a git repository for 
configure
        fi