[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/

[Davide Pesavento]

commit:     6d2d7d240d5d2f2836d3918c915691b727f553e3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 23:58:06 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 29 23:58:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6d2d7d24

dev-qt/qtdeclarative: block older qtquickcontrols due to file collisions

Gentoo-Bug: 579390

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild | 4 +++-
 dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild   | 4 +++-
 dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild     | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild
index cbbb871..dd88f47 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild
@@ -26,7 +26,9 @@ DEPEND="
                ~dev-qt/qtxmlpatterns-${PV}
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtquickcontrols-5.7:5
+"
 
 src_prepare() {
        use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
index cbbb871..dd88f47 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild
@@ -26,7 +26,9 @@ DEPEND="
                ~dev-qt/qtxmlpatterns-${PV}
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtquickcontrols-5.7:5
+"
 
 src_prepare() {
        use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index cbbb871..dd88f47 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -26,7 +26,9 @@ DEPEND="
                ~dev-qt/qtxmlpatterns-${PV}
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtquickcontrols-5.7:5
+"
 
 src_prepare() {
        use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")