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 003B3158041 for ; Wed, 8 Sep 2021 08:11:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 418BBE088F; Wed, 8 Sep 2021 08:11:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7F98FE088F for ; Wed, 8 Sep 2021 08:11:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48B90335CCF for ; Wed, 8 Sep 2021 08:11:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F942BA for ; Wed, 8 Sep 2021 08:10:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1631029418.7bdafe706c39de34b751bbccebf2e0c7bfe06135.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7bdafe706c39de34b751bbccebf2e0c7bfe06135 X-VCS-Branch: master Date: Wed, 8 Sep 2021 08:10:58 +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: 615eb6e0-f726-43f2-9a7f-3f4d65706be0 X-Archives-Hash: 65d58561362f6c749d5279618092c3d0 commit: 7bdafe706c39de34b751bbccebf2e0c7bfe06135 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 5 21:33:24 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 15:43:38 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7bdafe70 qt5-build.eclass: Introduce QT5_PV for intra-dev-qt deps Signed-off-by: Andreas Sturmlechner 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 40c9387a..a320a78d 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