1 |
commit: 0cf31b5c5e3847277cd6824c146e9fcf785fef2f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 12 00:30:31 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 12 07:07:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf31b5c |
7 |
|
8 |
dev-qt/qt-creator: Add dev-qt/qtxmlpatterns alternative test DEPEND |
9 |
|
10 |
In Qt 5.12, xmllistmodel moved from qtdeclarative[xml] into qtxmlpatterns. |
11 |
|
12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 8 ++++++-- |
16 |
dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 8 ++++++-- |
17 |
dev-qt/qt-creator/qt-creator-9999.ebuild | 8 ++++++-- |
18 |
3 files changed, 18 insertions(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild |
21 |
index 7e5bc26a04d..852389474b3 100644 |
22 |
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild |
23 |
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2018 Gentoo Authors |
26 |
+# Copyright 1999-2019 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=6 |
30 |
@@ -62,7 +62,11 @@ DEPEND="${CDEPEND} |
31 |
virtual/pkgconfig |
32 |
doc? ( >=dev-qt/qdoc-${QT_PV} ) |
33 |
test? ( |
34 |
- >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml] |
35 |
+ >=dev-qt/qtdeclarative-${QT_PV}[localstorage] |
36 |
+ || ( |
37 |
+ >=dev-qt/qtxmlpatterns-5.12.1-r1:5 |
38 |
+ <dev-qt/qtdeclarative-5.12.0[xml] |
39 |
+ ) |
40 |
>=dev-qt/qtquickcontrols2-${QT_PV} |
41 |
>=dev-qt/qttest-${QT_PV} |
42 |
) |
43 |
|
44 |
diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild |
45 |
index 207b4b6cbf8..5411ac70e83 100644 |
46 |
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild |
47 |
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild |
48 |
@@ -1,4 +1,4 @@ |
49 |
-# Copyright 1999-2018 Gentoo Authors |
50 |
+# Copyright 1999-2019 Gentoo Authors |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
EAPI=6 |
54 |
@@ -65,7 +65,11 @@ DEPEND="${CDEPEND} |
55 |
virtual/pkgconfig |
56 |
doc? ( >=dev-qt/qdoc-${QT_PV} ) |
57 |
test? ( |
58 |
- >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml] |
59 |
+ >=dev-qt/qtdeclarative-${QT_PV}[localstorage] |
60 |
+ || ( |
61 |
+ >=dev-qt/qtxmlpatterns-5.12.1-r1:5 |
62 |
+ <dev-qt/qtdeclarative-5.12.0[xml] |
63 |
+ ) |
64 |
>=dev-qt/qtquickcontrols2-${QT_PV} |
65 |
>=dev-qt/qttest-${QT_PV} |
66 |
) |
67 |
|
68 |
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild |
69 |
index 207b4b6cbf8..5411ac70e83 100644 |
70 |
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild |
71 |
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild |
72 |
@@ -1,4 +1,4 @@ |
73 |
-# Copyright 1999-2018 Gentoo Authors |
74 |
+# Copyright 1999-2019 Gentoo Authors |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
|
77 |
EAPI=6 |
78 |
@@ -65,7 +65,11 @@ DEPEND="${CDEPEND} |
79 |
virtual/pkgconfig |
80 |
doc? ( >=dev-qt/qdoc-${QT_PV} ) |
81 |
test? ( |
82 |
- >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml] |
83 |
+ >=dev-qt/qtdeclarative-${QT_PV}[localstorage] |
84 |
+ || ( |
85 |
+ >=dev-qt/qtxmlpatterns-5.12.1-r1:5 |
86 |
+ <dev-qt/qtdeclarative-5.12.0[xml] |
87 |
+ ) |
88 |
>=dev-qt/qtquickcontrols2-${QT_PV} |
89 |
>=dev-qt/qttest-${QT_PV} |
90 |
) |