From: Davide Pesavento <pesa@gentoo.org>
Date: Sat, 23 Apr 2016 12:08:12 +0000 (+0200)
Subject: dev-qt/qt-creator: block dev-util/qbs for now
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64c5690e58d2a178953ddd7907a5b5e59d99de25;p=gentoo.git

dev-qt/qt-creator: block dev-util/qbs for now

This is only temporary until we can unbundle it again.

Gentoo-Bug: 580880
Package-Manager: portage-2.2.28
---

diff --git a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
index 1b5bd0bfd2f7..71c837716493 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
@@ -58,6 +58,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( =sys-devel/clang-3.6.2*:= )
+	qbs? ( !dev-util/qbs )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "