[gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/

[Johannes Huber]

commit:     d2296ff9940b6a67986dcba4f343f9802693b500
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 12:01:13 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 23 12:01:13 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2296ff9

[x11-libs/libkscreen2] Block x11-libs/libkscreen

Fixes file collisions.

Package-Manager: portage-2.2.10

---
 x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 4 +++-
 x11-libs/libkscreen2/libkscreen2-9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild 
b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
@@ -31,4 +31,6 @@ DEPEND="
        x11-libs/libxcb
        x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !x11-libs/libkscreen:5
+"

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild 
b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -31,4 +31,6 @@ DEPEND="
        x11-libs/libxcb
        x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !x11-libs/libkscreen:5
+"