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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C635158042 for ; Wed, 16 Oct 2024 16:13:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52378E07A9; Wed, 16 Oct 2024 16:13:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 36925E07A9 for ; Wed, 16 Oct 2024 16:13:49 +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 019A9342FA0 for ; Wed, 16 Oct 2024 16:13:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6581014CA for ; Wed, 16 Oct 2024 16:13:46 +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: <1729095201.d15fed7177044717ef148dd54221412d5189442d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ecm-common.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d15fed7177044717ef148dd54221412d5189442d X-VCS-Branch: master Date: Wed, 16 Oct 2024 16:13:46 +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: bf472340-7b7c-4b12-b913-c20ef61988c7 X-Archives-Hash: 5d11c64b54a48ea0f19559be30a7e47a commit: d15fed7177044717ef148dd54221412d5189442d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 16 15:55:49 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 16 16:13:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15fed71 ecm-common.eclass: Add missing dev-qt/qt{core,base}:[56] BDEPEND Closes: https://bugs.gentoo.org/941617 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm-common.eclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eclass/ecm-common.eclass b/eclass/ecm-common.eclass index ba6840d75a6d..7f5d3d1e9915 100644 --- a/eclass/ecm-common.eclass +++ b/eclass/ecm-common.eclass @@ -165,8 +165,16 @@ if [[ ${ECM_KCM_TARGETS} ]]; then KF6_BDEPEND+=( "kde-frameworks/kcmutils:6" ) fi +KF6_BDEPEND+=( "dev-qt/qtbase:6" ) + if $(ver_test ${KFMIN} -lt 5.240) && [[ ${KF6_BDEPEND} && ${KF5_BDEPEND} ]]; then - BDEPEND+=" || ( ( ${KF6_BDEPEND[*]} ) ( ${KF5_BDEPEND[*]} ) )" + BDEPEND+=" || ( + ( ${KF6_BDEPEND[*]} ) + ( + ${KF5_BDEPEND[*]} + dev-qt/qtcore:5 + ) + )" else BDEPEND+=" ${KF6_BDEPEND[*]}" fi