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 A757E1581F3 for ; Tue, 3 Dec 2024 21:09:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0E09E082F; Tue, 3 Dec 2024 21:09:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2B05E082F for ; Tue, 3 Dec 2024 21:09:36 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9169A340C3C for ; Tue, 3 Dec 2024 21:09:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25FFD17CC for ; Tue, 3 Dec 2024 21:09:34 +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: <1733260167.3209ea08d76fd22e91876ad938f820a3d838cda1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild X-VCS-Directories: kde-frameworks/extra-cmake-modules/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3209ea08d76fd22e91876ad938f820a3d838cda1 X-VCS-Branch: master Date: Tue, 3 Dec 2024 21:09:34 +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: 8008f1ff-3282-489f-97b0-d39f41bb509e X-Archives-Hash: a332dac7312537b235a2fe57621de4fe commit: 3209ea08d76fd22e91876ad938f820a3d838cda1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 3 21:04:09 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 3 21:09:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3209ea08 kde-frameworks/extra-cmake-modules: Fix test dependencies Also set QT_MAJOR_VERSION=6 if testing, not going to add any complexity for optional Qt5 testing. Closes: https://bugs.gentoo.org/938316 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild | 11 ++++++++++- .../extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild index ed1f9497b3a5..33c2e7461970 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild @@ -17,6 +17,12 @@ IUSE="doc test" RESTRICT="!test? ( test )" RDEPEND="app-arch/libarchive[bzip2]" +DEPEND=" + test? ( + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + ) +" BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -24,8 +30,8 @@ BDEPEND=" >=dev-qt/qttools-${QTMIN}:6[assistant] ) test? ( - >=dev-qt/qttools-${QTMIN}:6[linguist] >=dev-qt/qtbase-${QTMIN}:6 + >=dev-qt/qttools-${QTMIN}:6[linguist] ) " @@ -54,6 +60,9 @@ src_configure() { -DBUILD_MAN_DOCS=$(usex doc) -DBUILD_TESTING=$(usex test) ) + if use test; then + mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316 + fi cmake_src_configure } diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild index ff645083e05b..15428fb1dd55 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild @@ -17,6 +17,12 @@ IUSE="doc test" RESTRICT="!test? ( test )" RDEPEND="app-arch/libarchive[bzip2]" +DEPEND=" + test? ( + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + ) +" BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -24,8 +30,8 @@ BDEPEND=" >=dev-qt/qttools-${QTMIN}:6[assistant] ) test? ( - >=dev-qt/qttools-${QTMIN}:6[linguist] >=dev-qt/qtbase-${QTMIN}:6 + >=dev-qt/qttools-${QTMIN}:6[linguist] ) " @@ -53,6 +59,9 @@ src_configure() { -DBUILD_MAN_DOCS=$(usex doc) -DBUILD_TESTING=$(usex test) ) + if use test; then + mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316 + fi cmake_src_configure }