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

[Andreas Sturmlechner]

commit:     fb4ee29e3ed5d9eb62f7613e897ff277b320a10f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 22:16:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 22:44:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb4ee29e

dev-qt/qtxmlpatterns: Block <dev-qt/qtdeclarative-5.12.0_beta4:5

* Detected file collision(s):
*
*      /usr/lib64/qt5/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so
*      /usr/lib64/qt5/qml/QtQuick/XmlListModel/plugins.qmltypes
*      /usr/lib64/qt5/qml/QtQuick/XmlListModel/qmldir

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.0_beta4.ebuild | 4 +++-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.9999.ebuild    | 6 ++++--
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.9999.ebuild       | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.0_beta4.ebuild 
b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.0_beta4.ebuild
index 22c2abf1..ddaa794e 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.0_beta4.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.0_beta4.ebuild
@@ -16,4 +16,6 @@ DEPEND="
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtnetwork-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtdeclarative-5.12.0_beta4:5
+"

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.9999.ebuild 
b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.9999.ebuild
index 8e0054f7..ddaa794e 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,4 +16,6 @@ DEPEND="
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtnetwork-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtdeclarative-5.12.0_beta4:5
+"

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9999.ebuild 
b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9999.ebuild
index 8e0054f7..ddaa794e 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,4 +16,6 @@ DEPEND="
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtnetwork-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<dev-qt/qtdeclarative-5.12.0_beta4:5
+"