[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Andreas Sturmlechner]

commit:     0cf31b5c5e3847277cd6824c146e9fcf785fef2f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 00:30:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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/qtdeclarative-5.12.0[xml]
+               )
                >=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/qtdeclarative-5.12.0[xml]
+               )
                >=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/qtdeclarative-5.12.0[xml]
+               )
                >=dev-qt/qtquickcontrols2-${QT_PV}
                >=dev-qt/qttest-${QT_PV}
        )