From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-884444-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id B5A781381F1
	for <garchives@archives.gentoo.org>; Sun, 29 May 2016 23:59:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F211394103;
	Sun, 29 May 2016 23:58:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 552CF94103
	for <gentoo-commits@lists.gentoo.org>; Sun, 29 May 2016 23:58:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 9E065340B29
	for <gentoo-commits@lists.gentoo.org>; Sun, 29 May 2016 23:58:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DF3B180
	for <gentoo-commits@lists.gentoo.org>; Sun, 29 May 2016 23:58:21 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" <pesa@gentoo.org>
Message-ID: <1464566286.6d2d7d240d5d2f2836d3918c915691b727f553e3.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
X-VCS-Repository: proj/qt
X-VCS-Files: dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild dev-qt/qtdeclarative/qtdeclarative-5.7.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
X-VCS-Directories: dev-qt/qtdeclarative/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 6d2d7d240d5d2f2836d3918c915691b727f553e3
X-VCS-Branch: master
Date: Sun, 29 May 2016 23:58:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 56f30507-61c9-4bcf-ac49-c889dccececd
X-Archives-Hash: 3918eac265c934d2df897523ea1f0df4

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")