From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id B34581582EF for ; Tue, 11 Mar 2025 00:51:55 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9ABB63430E4 for ; Tue, 11 Mar 2025 00:51:55 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A047111037F; Tue, 11 Mar 2025 00:51: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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 93EE911037F for ; Tue, 11 Mar 2025 00:51: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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4797D3430E4 for ; Tue, 11 Mar 2025 00:51:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A47A19A7 for ; Tue, 11 Mar 2025 00:51:52 +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: <1741654297.e0b0e57cb2e768b12b40c79feb7a603848ab8d34.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e0b0e57cb2e768b12b40c79feb7a603848ab8d34 X-VCS-Branch: master Date: Tue, 11 Mar 2025 00:51:52 +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: 1eb6cfe1-6fd3-4b72-9b78-5a359dc4ace5 X-Archives-Hash: ae361747018572c03a6d24c2ecd86e9d commit: e0b0e57cb2e768b12b40c79feb7a603848ab8d34 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Mar 11 00:50:11 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Mar 11 00:51:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b0e57c dev-qt/qtwebengine: fix live builds with USE=-pdfium Seems to be lacking some guards against the other options, but it doesn't really make sense for the ebuild to rely on these and should just not pass when the main switch is off. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 6 +++--- dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 6 +++--- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index e76cbf965cca..5201c2915e1f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -170,13 +170,13 @@ src_prepare() { src_configure() { local mycmakeargs=( $(qt_feature pdfium qtpdf_build) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(qt_feature widgets qtpdf_widgets_build) + $(use pdfium && qt_feature qml qtpdf_quick_build) + $(use pdfium && qt_feature widgets qtpdf_widgets_build) $(usev pdfium -DQT_FEATURE_pdf_v8=ON) -DQT_FEATURE_qtwebengine_build=ON $(qt_feature qml qtwebengine_quick_build) + $(qt_feature webdriver webenginedriver) $(qt_feature widgets qtwebengine_widgets_build) $(cmake_use_find_package designer Qt6Designer) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index 63706308a595..1a6a21048d46 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -165,9 +165,8 @@ src_prepare() { src_configure() { local mycmakeargs=( $(qt_feature pdfium qtpdf_build) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(qt_feature widgets qtpdf_widgets_build) + $(use pdfium && qt_feature qml qtpdf_quick_build) + $(use pdfium && qt_feature widgets qtpdf_widgets_build) $(usev pdfium -DQT_FEATURE_pdf_v8=ON) # TODO?: since 6.9.0, dependency checks have been adjusted to make it @@ -176,6 +175,7 @@ src_configure() { # on qtwebengine[webengine(+)] -DQT_FEATURE_qtwebengine_build=ON $(qt_feature qml qtwebengine_quick_build) + $(qt_feature webdriver webenginedriver) $(qt_feature widgets qtwebengine_widgets_build) $(cmake_use_find_package designer Qt6Designer) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 1b875f6f7354..1808541fc80c 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -164,9 +164,8 @@ src_prepare() { src_configure() { local mycmakeargs=( $(qt_feature pdfium qtpdf_build) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(qt_feature widgets qtpdf_widgets_build) + $(use pdfium && qt_feature qml qtpdf_quick_build) + $(use pdfium && qt_feature widgets qtpdf_widgets_build) $(usev pdfium -DQT_FEATURE_pdf_v8=ON) # TODO?: since 6.9.0, dependency checks have been adjusted to make it @@ -175,6 +174,7 @@ src_configure() { # on qtwebengine[webengine(+)] -DQT_FEATURE_qtwebengine_build=ON $(qt_feature qml qtwebengine_quick_build) + $(qt_feature webdriver webenginedriver) $(qt_feature widgets qtwebengine_widgets_build) $(cmake_use_find_package designer Qt6Designer)