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 54180158089 for ; Wed, 13 Sep 2023 16:42:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B0232BC027; Wed, 13 Sep 2023 16:42:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 626532BC01E for ; Wed, 13 Sep 2023 16:42:07 +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 AEB16335CDF for ; Wed, 13 Sep 2023 16:42:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F31EA11AA for ; Wed, 13 Sep 2023 16:42:03 +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: <1694623219.67e0030c162d2705133385b5829486588bd6b8df.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.6.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: 67e0030c162d2705133385b5829486588bd6b8df X-VCS-Branch: master Date: Wed, 13 Sep 2023 16:42:03 +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: 62eebaec-73a6-48c9-9d45-c5c639cffa44 X-Archives-Hash: d51c0fb029d35b347bae9fe1ab635476 commit: 67e0030c162d2705133385b5829486588bd6b8df Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 13 13:42:24 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 13 16:40:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e0030c dev-qt/qttools: update qdoc handling in 6.6+ Did suspect that qdoc would become its own option eventually. It now also requires qml and clangcpp (on top of clang), not that we really need to pass clangcpp feature given it does no test and just mirrors the clang feature. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/qttools-6.6.9999.ebuild | 6 +++--- dev-qt/qttools/qttools-6.9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild index 490a140a2905..0e1eba0054cc 100644 --- a/dev-qt/qttools/qttools-6.6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.6.9999.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE=" designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) - qdoc? ( clang ) + qdoc? ( clang qml ) " # behaves very badly when qttools is not already installed, also @@ -61,13 +61,13 @@ src_configure() { $(cmake_use_find_package qml Qt6Qml) $(cmake_use_find_package widgets Qt6Widgets) $(qt_feature assistant) - $(qt_feature clang clangcpp) + $(qt_feature clang) $(qt_feature designer) $(qt_feature distancefieldgenerator) $(qt_feature linguist) $(qt_feature pixeltool) $(qt_feature qdbus) - $(qt_feature qdoc clang) + $(qt_feature qdoc) $(qt_feature qtattributionsscanner) $(qt_feature qtdiag) $(qt_feature qtplugininfo) diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 490a140a2905..0e1eba0054cc 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE=" designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) - qdoc? ( clang ) + qdoc? ( clang qml ) " # behaves very badly when qttools is not already installed, also @@ -61,13 +61,13 @@ src_configure() { $(cmake_use_find_package qml Qt6Qml) $(cmake_use_find_package widgets Qt6Widgets) $(qt_feature assistant) - $(qt_feature clang clangcpp) + $(qt_feature clang) $(qt_feature designer) $(qt_feature distancefieldgenerator) $(qt_feature linguist) $(qt_feature pixeltool) $(qt_feature qdbus) - $(qt_feature qdoc clang) + $(qt_feature qdoc) $(qt_feature qtattributionsscanner) $(qt_feature qtdiag) $(qt_feature qtplugininfo)