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 26FB4158094 for ; Tue, 21 Jun 2022 20:15:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68104E095A; Tue, 21 Jun 2022 20:15:11 +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 4EBFEE095A for ; Tue, 21 Jun 2022 20:15:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 57CFF3412A8 for ; Tue, 21 Jun 2022 20:15:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D42B7F for ; Tue, 21 Jun 2022 20:15:09 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1655842475.125f5fbc716c85d598be7f4b4382784d57a0d8e5.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 125f5fbc716c85d598be7f4b4382784d57a0d8e5 X-VCS-Branch: master Date: Tue, 21 Jun 2022 20:15:09 +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: a8607c57-3857-44f5-98e0-9e5f0cda3919 X-Archives-Hash: 5753c7621e5bb52c268482ad4d7f2c9e commit: 125f5fbc716c85d598be7f4b4382784d57a0d8e5 Author: Jimi Huotari gentoo org> AuthorDate: Tue Jun 21 20:14:35 2022 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Tue Jun 21 20:14:35 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=125f5fbc dev-qt/qtdeclarative: fix qt6 configure with different USE-flags These flags need to match those of 'qtbase'. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild | 5 +---- dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild | 5 +---- dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild index 3204679c..6401d1d4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild @@ -14,11 +14,8 @@ fi IUSE="opengl sql widgets" DEPEND=" - =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-${PV}* - opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) - sql? ( =dev-qt/qtbase-${PV}*[sql] ) - widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild index 3204679c..6401d1d4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.9999.ebuild @@ -14,11 +14,8 @@ fi IUSE="opengl sql widgets" DEPEND=" - =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-${PV}* - opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) - sql? ( =dev-qt/qtbase-${PV}*[sql] ) - widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 3204679c..6401d1d4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -14,11 +14,8 @@ fi IUSE="opengl sql widgets" DEPEND=" - =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-${PV}* - opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) - sql? ( =dev-qt/qtbase-${PV}*[sql] ) - widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}"