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 B2E2B158089 for ; Tue, 5 Sep 2023 13:06:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A2432BC072; Tue, 5 Sep 2023 13:05:54 +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 1C42A2BC074 for ; Tue, 5 Sep 2023 13:05:54 +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 78225335D44 for ; Tue, 5 Sep 2023 13:05:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45EFB114C for ; Tue, 5 Sep 2023 13:05:49 +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: <1693918875.41dd954489280c04c1d8c9cf1fcfb0c612835ec6.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qttools/qttools-6.5.2-r1.ebuild dev-qt/qttools/qttools-6.5.9999.ebuild dev-qt/qttools/qttools-6.9999.ebuild X-VCS-Directories: dev-qt/qttools/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 41dd954489280c04c1d8c9cf1fcfb0c612835ec6 X-VCS-Branch: master Date: Tue, 5 Sep 2023 13:05:49 +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: 31f8c344-312d-4432-a145-8f313e050f62 X-Archives-Hash: 1c704f4ad000efa25c6a3847e7201dfb commit: 41dd954489280c04c1d8c9cf1fcfb0c612835ec6 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 4 19:51:17 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Sep 5 13:01:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dd9544 dev-qt/qttools: depend on qtbase[gles2-only=] for qtdiag Same as opengl and vulkan, qtdiag has the whole slew of QT_CONFIG that would break if qtbase disables support. Albeit unfortunate with unsplit qttools given USE is a no-op (like vulkan) unless qtdiag is enabled. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/qttools-6.5.2-r1.ebuild | 8 ++++---- dev-qt/qttools/qttools-6.5.9999.ebuild | 8 ++++---- dev-qt/qttools/qttools-6.9999.ebuild | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild b/dev-qt/qttools/qttools-6.5.2-r1.ebuild index 7c33c8b042a1..4c7d4b23fe7b 100644 --- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild +++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild @@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - assistant clang designer distancefieldgenerator +linguist - opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag - qtplugininfo vulkan +widgets + assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets " # note that some tools do not *require* widgets but will skip a sub-tool # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) @@ -39,7 +39,7 @@ RDEPEND=" designer? ( ~dev-qt/qtbase-${PV}:6[xml] ) qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) - qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " DEPEND="${RDEPEND}" diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild index 7c33c8b042a1..4c7d4b23fe7b 100644 --- a/dev-qt/qttools/qttools-6.5.9999.ebuild +++ b/dev-qt/qttools/qttools-6.5.9999.ebuild @@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - assistant clang designer distancefieldgenerator +linguist - opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag - qtplugininfo vulkan +widgets + assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets " # note that some tools do not *require* widgets but will skip a sub-tool # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) @@ -39,7 +39,7 @@ RDEPEND=" designer? ( ~dev-qt/qtbase-${PV}:6[xml] ) qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) - qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " DEPEND="${RDEPEND}" diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 7c33c8b042a1..4c7d4b23fe7b 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -12,9 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - assistant clang designer distancefieldgenerator +linguist - opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag - qtplugininfo vulkan +widgets + assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets " # note that some tools do not *require* widgets but will skip a sub-tool # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) @@ -39,7 +39,7 @@ RDEPEND=" designer? ( ~dev-qt/qtbase-${PV}:6[xml] ) qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) - qtdiag? ( ~dev-qt/qtbase-${PV}:6[vulkan=] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " DEPEND="${RDEPEND}"