1 |
commit: 6d2d7d240d5d2f2836d3918c915691b727f553e3 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 29 23:58:06 2016 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 29 23:58:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6d2d7d24 |
7 |
|
8 |
dev-qt/qtdeclarative: block older qtquickcontrols due to file collisions |
9 |
|
10 |
Gentoo-Bug: 579390 |
11 |
|
12 |
Package-Manager: portage-2.3.0_rc1 |
13 |
|
14 |
dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild | 4 +++- |
15 |
dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild | 4 +++- |
16 |
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 4 +++- |
17 |
3 files changed, 9 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild |
20 |
index cbbb871..dd88f47 100644 |
21 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild |
22 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild |
23 |
@@ -26,7 +26,9 @@ DEPEND=" |
24 |
~dev-qt/qtxmlpatterns-${PV} |
25 |
) |
26 |
" |
27 |
-RDEPEND="${DEPEND}" |
28 |
+RDEPEND="${DEPEND} |
29 |
+ !<dev-qt/qtquickcontrols-5.7:5 |
30 |
+" |
31 |
|
32 |
src_prepare() { |
33 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
34 |
|
35 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild |
36 |
index cbbb871..dd88f47 100644 |
37 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild |
38 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild |
39 |
@@ -26,7 +26,9 @@ DEPEND=" |
40 |
~dev-qt/qtxmlpatterns-${PV} |
41 |
) |
42 |
" |
43 |
-RDEPEND="${DEPEND}" |
44 |
+RDEPEND="${DEPEND} |
45 |
+ !<dev-qt/qtquickcontrols-5.7:5 |
46 |
+" |
47 |
|
48 |
src_prepare() { |
49 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
50 |
|
51 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
52 |
index cbbb871..dd88f47 100644 |
53 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
54 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
55 |
@@ -26,7 +26,9 @@ DEPEND=" |
56 |
~dev-qt/qtxmlpatterns-${PV} |
57 |
) |
58 |
" |
59 |
-RDEPEND="${DEPEND}" |
60 |
+RDEPEND="${DEPEND} |
61 |
+ !<dev-qt/qtquickcontrols-5.7:5 |
62 |
+" |
63 |
|
64 |
src_prepare() { |
65 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |