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 883EC158089 for ; Sat, 9 Sep 2023 16:22:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C07812BC035; Sat, 9 Sep 2023 16:22:51 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A31C52BC036 for ; Sat, 9 Sep 2023 16:22:51 +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 B3F70335C52 for ; Sat, 9 Sep 2023 16:22:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D59D71166 for ; Sat, 9 Sep 2023 16:22:47 +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: <1694275592.e69ee1b26d41ce7a3edeb96e2c48ab3b64e6ae4a.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtscxml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtscxml/metadata.xml dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild dev-qt/qtscxml/qtscxml-6.5.2.ebuild dev-qt/qtscxml/qtscxml-6.5.9999.ebuild dev-qt/qtscxml/qtscxml-6.9999.ebuild X-VCS-Directories: dev-qt/qtscxml/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e69ee1b26d41ce7a3edeb96e2c48ab3b64e6ae4a X-VCS-Branch: master Date: Sat, 9 Sep 2023 16:22:47 +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: ff8f89e6-cc61-4909-96d2-1164ea177298 X-Archives-Hash: d06f51ceaff69cd262c45c66619f9494 commit: e69ee1b26d41ce7a3edeb96e2c48ab3b64e6ae4a Author: Ionen Wolkens gentoo org> AuthorDate: Fri Sep 8 09:27:34 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Sep 9 16:06:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69ee1b2 dev-qt/qtscxml: tighten deps, make qml optional Missed that qml could be reasonably optional here. And cannot find where it would need the rest outside examples. Gui could technically be optional but would need its own USE. Do not think it is worth it here unless someone wants this. Maybe missing it, but failed to find anything at all using opengl, it is listed in the docs but...? Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtscxml/metadata.xml | 3 +++ .../{qtscxml-6.5.2.ebuild => qtscxml-6.5.2-r1.ebuild} | 16 +++++++++++++--- dev-qt/qtscxml/qtscxml-6.5.9999.ebuild | 16 +++++++++++++--- dev-qt/qtscxml/qtscxml-6.9999.ebuild | 16 +++++++++++++--- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtscxml/metadata.xml b/dev-qt/qtscxml/metadata.xml index 702f3c500dd7..ef86286201dd 100644 --- a/dev-qt/qtscxml/metadata.xml +++ b/dev-qt/qtscxml/metadata.xml @@ -5,6 +5,9 @@ qt@gentoo.org Gentoo Qt Project + + Build QML/QtQuick bindings and imports + https://bugreports.qt.io/ https://doc.qt.io/ diff --git a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild b/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild similarity index 61% rename from dev-qt/qtscxml/qtscxml-6.5.2.ebuild rename to dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild index c3e29fd2e2f0..3baf824212bc 100644 --- a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild @@ -11,14 +11,24 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="qml" + RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets] - ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtbase-${PV}:6[gui] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " DEPEND="${RDEPEND}" CMAKE_SKIP_TESTS=( # may fail with pid-sandbox, or at least musl/hardened+gcc (exact - # conditions unknown but passes without pid, consider flaky) + # conditions unknown but passes without pid, considering this flaky) tst_qstatemachine ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild index c3e29fd2e2f0..3baf824212bc 100644 --- a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild @@ -11,14 +11,24 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="qml" + RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets] - ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtbase-${PV}:6[gui] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " DEPEND="${RDEPEND}" CMAKE_SKIP_TESTS=( # may fail with pid-sandbox, or at least musl/hardened+gcc (exact - # conditions unknown but passes without pid, consider flaky) + # conditions unknown but passes without pid, considering this flaky) tst_qstatemachine ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild index c3e29fd2e2f0..3baf824212bc 100644 --- a/dev-qt/qtscxml/qtscxml-6.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild @@ -11,14 +11,24 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="qml" + RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets] - ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtbase-${PV}:6[gui] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " DEPEND="${RDEPEND}" CMAKE_SKIP_TESTS=( # may fail with pid-sandbox, or at least musl/hardened+gcc (exact - # conditions unknown but passes without pid, consider flaky) + # conditions unknown but passes without pid, considering this flaky) tst_qstatemachine ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +}