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 74F9D158043 for ; Sat, 20 Apr 2024 14:20:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5005E29A9; Sat, 20 Apr 2024 14:20:16 +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 92B86E29A9 for ; Sat, 20 Apr 2024 14:20:16 +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 8B24E3433F4 for ; Sat, 20 Apr 2024 14:20:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDAAC16F9 for ; Sat, 20 Apr 2024 14:20:13 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1713622794.fbf048eddd72b5377dca5dd44e5960f4e70cf963.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt6-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: fbf048eddd72b5377dca5dd44e5960f4e70cf963 X-VCS-Branch: master Date: Sat, 20 Apr 2024 14:20:13 +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: 4e495e23-1fbf-42a1-80f5-9c47cf2a3452 X-Archives-Hash: be145f9fd72b0ff7c20fa13a722b22f9 commit: fbf048eddd72b5377dca5dd44e5960f4e70cf963 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Apr 20 13:16:28 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Apr 20 14:19:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf048ed qt6-build.eclass: add QT6_RESTRICT_TESTS variable At same time, remove the qttranslations special logic, it can just make use of the variable instead. Bug: https://bugs.gentoo.org/930266 Signed-off-by: Ionen Wolkens gentoo.org> eclass/qt6-build.eclass | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 59baaa77ce6d..8fb40c287672 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -37,6 +37,15 @@ inherit cmake flag-o-matic toolchain-funcs # - pre-release: development 6.x.x_rc/beta/alpha releases # - live: *.9999 (dev branch), 6.x.9999 (stable branch) +# @ECLASS_VARIABLE: QT6_RESTRICT_TESTS +# @DEFAULT_UNSET +# @PRE_INHERIT +# @DESCRIPTION: +# If set to a non-empty value, will not add IUSE="test" and set +# RESTRICT="test" instead. Primarily intended for ebuilds where +# running tests is unmaintained (or missing) rather than just +# temporarily restricted not to have a broken USE (bug #930266). + if [[ ${PV} == *.9999 ]]; then inherit git-r3 EGIT_REPO_URI=( @@ -68,7 +77,9 @@ HOMEPAGE="https://www.qt.io/" LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" SLOT=6/${PV%%_*} -if [[ ${PN} != qttranslations ]]; then +if [[ ${QT6_RESTRICT_TESTS} ]]; then + RESTRICT="test" +else IUSE="test" RESTRICT="!test? ( test )" fi @@ -139,7 +150,7 @@ qt6-build_src_configure() { # see _qt6-build_create_user_facing_links -DINSTALL_PUBLICBINDIR="${QT6_PREFIX}"/bin # note that if qtbase was built with tests, this is default ON - -DQT_BUILD_TESTS=$(usex test ON OFF) + -DQT_BUILD_TESTS=$(in_iuse test && use test && echo ON || echo OFF) # avoid appending -O2 after user's C(XX)FLAGS (bug #911822) -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON )