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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B37C8138334 for ; Tue, 12 Mar 2019 07:10:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8C68E0B19; Tue, 12 Mar 2019 07:10:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87555E0B19 for ; Tue, 12 Mar 2019 07:10:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DF91335CB7 for ; Tue, 12 Mar 2019 07:10:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39F3257B for ; Tue, 12 Mar 2019 07:10:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1552374460.0cf31b5c5e3847277cd6824c146e9fcf785fef2f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-creator/qt-creator-4.6.2.ebuild dev-qt/qt-creator/qt-creator-4.8.0.ebuild dev-qt/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0cf31b5c5e3847277cd6824c146e9fcf785fef2f X-VCS-Branch: master Date: Tue, 12 Mar 2019 07:10:18 +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: 70ba410e-c5c3-4efc-809f-bab04fb3abbf X-Archives-Hash: 52499c527fcf1ce3e9c2e7dbe812c73c commit: 0cf31b5c5e3847277cd6824c146e9fcf785fef2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 12 00:30:31 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 12 07:07:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf31b5c dev-qt/qt-creator: Add dev-qt/qtxmlpatterns alternative test DEPEND In Qt 5.12, xmllistmodel moved from qtdeclarative[xml] into qtxmlpatterns. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 8 ++++++-- dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 8 ++++++-- dev-qt/qt-creator/qt-creator-9999.ebuild | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild index 7e5bc26a04d..852389474b3 100644 --- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -62,7 +62,11 @@ DEPEND="${CDEPEND} virtual/pkgconfig doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( - >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml] + >=dev-qt/qtdeclarative-${QT_PV}[localstorage] + || ( + >=dev-qt/qtxmlpatterns-5.12.1-r1:5 + =dev-qt/qtquickcontrols2-${QT_PV} >=dev-qt/qttest-${QT_PV} ) diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild index 207b4b6cbf8..5411ac70e83 100644 --- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -65,7 +65,11 @@ DEPEND="${CDEPEND} virtual/pkgconfig doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( - >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml] + >=dev-qt/qtdeclarative-${QT_PV}[localstorage] + || ( + >=dev-qt/qtxmlpatterns-5.12.1-r1:5 + =dev-qt/qtquickcontrols2-${QT_PV} >=dev-qt/qttest-${QT_PV} ) diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 207b4b6cbf8..5411ac70e83 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -65,7 +65,11 @@ DEPEND="${CDEPEND} virtual/pkgconfig doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( - >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml] + >=dev-qt/qtdeclarative-${QT_PV}[localstorage] + || ( + >=dev-qt/qtxmlpatterns-5.12.1-r1:5 + =dev-qt/qtquickcontrols2-${QT_PV} >=dev-qt/qttest-${QT_PV} )