| 1 |
commit: d2296ff9940b6a67986dcba4f343f9802693b500 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 23 12:01:13 2014 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 23 12:01:13 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2296ff9 |
| 7 |
|
| 8 |
[x11-libs/libkscreen2] Block x11-libs/libkscreen |
| 9 |
|
| 10 |
Fixes file collisions. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.10 |
| 13 |
|
| 14 |
--- |
| 15 |
x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 4 +++- |
| 16 |
x11-libs/libkscreen2/libkscreen2-9999.ebuild | 4 +++- |
| 17 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild |
| 20 |
index 212b325..4b92a5d 100644 |
| 21 |
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild |
| 22 |
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild |
| 23 |
@@ -31,4 +31,6 @@ DEPEND=" |
| 24 |
x11-libs/libxcb |
| 25 |
x11-libs/libXrandr |
| 26 |
" |
| 27 |
-RDEPEND="${DEPEND}" |
| 28 |
+RDEPEND="${DEPEND} |
| 29 |
+ !x11-libs/libkscreen:5 |
| 30 |
+" |
| 31 |
|
| 32 |
diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild |
| 33 |
index 212b325..4b92a5d 100644 |
| 34 |
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild |
| 35 |
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild |
| 36 |
@@ -31,4 +31,6 @@ DEPEND=" |
| 37 |
x11-libs/libxcb |
| 38 |
x11-libs/libXrandr |
| 39 |
" |
| 40 |
-RDEPEND="${DEPEND}" |
| 41 |
+RDEPEND="${DEPEND} |
| 42 |
+ !x11-libs/libkscreen:5 |
| 43 |
+" |
Archives