diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-11-13 23:16:49 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-11-13 23:44:20 +0100 |
commit | fb4ee29e3ed5d9eb62f7613e897ff277b320a10f (patch) | |
tree | 23086d215f0e319f3a2bf8dcb06ee20242c0cd92 /dev-qt/qtxmlpatterns | |
parent | dev-qt: Add Qt 5.12.0_beta4 (diff) | |
download | qt-fb4ee29e3ed5d9eb62f7613e897ff277b320a10f.tar.gz qt-fb4ee29e3ed5d9eb62f7613e897ff277b320a10f.tar.bz2 qt-fb4ee29e3ed5d9eb62f7613e897ff277b320a10f.zip |
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@gentoo.org>
Diffstat (limited to 'dev-qt/qtxmlpatterns')
-rw-r--r-- | dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.0_beta4.ebuild | 4 | ||||
-rw-r--r-- | dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.9999.ebuild | 6 | ||||
-rw-r--r-- | 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 +" |