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@gentoo.org>

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 7e5bc26a04dfda64eb964738240412c10cd90403..852389474b34fb88de808b0302e35563caf102b2 100644 (file)
--- 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 207b4b6cbf83bba63fb2832d3ce4d9529557a580..5411ac70e83a672f8b9d24dc37094c0491047ee9 100644 (file)
--- 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 207b4b6cbf83bba63fb2832d3ce4d9529557a580..5411ac70e83a672f8b9d24dc37094c0491047ee9 100644 (file)
--- 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}
        )