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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 634DA158043 for ; Sat, 20 Apr 2024 17:32:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B20FFE29E4; Sat, 20 Apr 2024 17:32:31 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 93DD9E29E4 for ; Sat, 20 Apr 2024 17:32:31 +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 940B0343363 for ; Sat, 20 Apr 2024 17:32:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E35271747 for ; Sat, 20 Apr 2024 17:32:28 +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: <1713634252.c8d7b970259552249853a4c59424c3c91773ce14.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebchannel/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild X-VCS-Directories: dev-qt/qtwebchannel/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c8d7b970259552249853a4c59424c3c91773ce14 X-VCS-Branch: master Date: Sat, 20 Apr 2024 17:32:28 +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: 8ee70cc7-8447-4ca3-9be9-2fb026b082cd X-Archives-Hash: 25d3e8c16f488c9e0ff9a51ccb555b87 commit: c8d7b970259552249853a4c59424c3c91773ce14 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Apr 20 17:15:52 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Apr 20 17:30:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d7b970 dev-qt/qtwebchannel: adjust version check for qtdeclarative (qt6) To recap, this checks for Quick, and then implicitly uses Qml in a different file. Normally would disable Qt6Qml to disable both but that gives an "unused option" warning if a *matching version* qtdeclarative does not exist (and tinderbox automated report). However, noticed that qtwebchannel-6.7.0 installed some Quick files and that's because upgraded from 6.7.0_rc2 to 6.7.0 and internally that's both 6.7.0. This also shouldn't be using >=, but rather =$(ver_cut 1-3)*. It'd be simpler+safer to just ignore the unused option warning and always pass it though (it'd also work for 9999 ebuilds more properly), but it's not a big enough deal to be worth the noise. Signed-off-by: Ionen Wolkens gentoo.org> .../{qtwebchannel-6.7.0.ebuild => qtwebchannel-6.7.0-r1.ebuild} | 2 +- dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild | 2 +- dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild similarity index 88% rename from dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild rename to dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild index 0ef32e10921e..14c71fa0c22a 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) qt6-build_src_configure diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild index 7d637d64ccb2..aef8086235b6 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) qt6-build_src_configure diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild index 7d637d64ccb2..aef8086235b6 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692 + has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) qt6-build_src_configure