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 1E476158015 for ; Thu, 21 Dec 2023 16:41:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E402D2BC016; Thu, 21 Dec 2023 16:41:33 +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 C74352BC016 for ; Thu, 21 Dec 2023 16:41:33 +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 8FD5D340DE6 for ; Thu, 21 Dec 2023 16:41:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB1789C4 for ; Thu, 21 Dec 2023 16:41:30 +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: <1703176457.48d9b407c3f776931ad0872df5dfd97bb56621ac.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 48d9b407c3f776931ad0872df5dfd97bb56621ac X-VCS-Branch: master Date: Thu, 21 Dec 2023 16:41:30 +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: e5914c86-164f-4e96-96c6-1c5a8a47e376 X-Archives-Hash: e644acbaeb5a3ef5762321e85a7144c2 commit: 48d9b407c3f776931ad0872df5dfd97bb56621ac Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 21 16:26:27 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 21 16:34:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d9b407 ecm.eclass: Drop dev-qt/qtbase:6[test] Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 3c102d669caf..c633fe39d98c 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -129,8 +129,8 @@ fi # "forceoptional-recursive". # Default value is "false", except for CATEGORY=kde-frameworks where it is # set to "true". If set to "false", do nothing. -# For any other value, add "test" to IUSE and DEPEND on dev-qt/qtbase:6[test] -# (for KF5: dev-qt/qttest:5). If set to "optional", build with +# For any other value, add "test" to IUSE (and for KF5 DEPEND on +# dev-qt/qttest:5). If set to "optional", build with # -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON when USE=!test. If set # to "forceoptional", punt Qt${_KFSLOT}Test dependency and ignore "autotests", # "test", "tests" subdirs from top-level CMakeLists.txt when USE=!test. @@ -260,9 +260,7 @@ esac case ${ECM_TEST} in true|optional|forceoptional|forceoptional-recursive) IUSE+=" test" - if [[ ${_KFSLOT} == 6 ]]; then - DEPEND+=" test? ( dev-qt/qtbase:${_KFSLOT}[test] )" - else + if [[ ${_KFSLOT} == 5 ]]; then DEPEND+=" test? ( dev-qt/qttest:${_KFSLOT} )" fi RESTRICT+=" !test? ( test )"