[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/

[Johannes Huber]

commit:     a6992213687b1ed6be9a77c034fe99ec68cd0cc5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 09:46:12 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 09:46:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6992213

dev-util/kdevelop: Prevent file collisions

dev-util/kdevelop-qmljs  was merged into dev-util/kdevelop.

Package-Manager: portage-2.2.20.1

 dev-util/kdevelop/kdevelop-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild 
b/dev-util/kdevelop/kdevelop-9999.ebuild
index bd4a014..c72b5d7 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -50,6 +50,7 @@ RDEPEND="${DEPEND}
        ninja? ( dev-util/ninja )
        !dev-util/kdevelop:4
        !dev-util/kdevelop-qmake
+       !dev-util/kdevelop-qmljs
 "
 
 RESTRICT="test"