commit: 0ff5601d655fecb6021f847e296dc44111544c15
Author: Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Mon Aug 11 15:45:28 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 18:40:07 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0ff5601d
[kde-base/khotkeys] Block kde-base/systemsettings:4
Add a block on kde-base/systemsettings:4, due to a file conflict in the
handbooks.
Package-Manager: portage-2.2.8-r1
---
kde-base/khotkeys/khotkeys-5.0.0.ebuild | 1 +
kde-base/khotkeys/khotkeys-5.0.9999.ebuild | 1 +
kde-base/khotkeys/khotkeys-9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/kde-base/khotkeys/khotkeys-5.0.0.ebuild
b/kde-base/khotkeys/khotkeys-5.0.0.ebuild
index b2425b3..c854e57 100644
--- a/kde-base/khotkeys/khotkeys-5.0.0.ebuild
+++ b/kde-base/khotkeys/khotkeys-5.0.0.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
!kde-base/khotkeys:4
+ !kde-base/systemsettings:4
"
DEPEND="${COMMON_DEPEND}
x11-libs/libxcb
diff --git a/kde-base/khotkeys/khotkeys-5.0.9999.ebuild
b/kde-base/khotkeys/khotkeys-5.0.9999.ebuild
index 9891f28..e01f394 100644
--- a/kde-base/khotkeys/khotkeys-5.0.9999.ebuild
+++ b/kde-base/khotkeys/khotkeys-5.0.9999.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
!kde-base/khotkeys:4
+ !kde-base/systemsettings:4
"
DEPEND="${COMMON_DEPEND}
x11-libs/libxcb
diff --git a/kde-base/khotkeys/khotkeys-9999.ebuild
b/kde-base/khotkeys/khotkeys-9999.ebuild
index 9891f28..e01f394 100644
--- a/kde-base/khotkeys/khotkeys-9999.ebuild
+++ b/kde-base/khotkeys/khotkeys-9999.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
!kde-base/khotkeys:4
+ !kde-base/systemsettings:4
"
DEPEND="${COMMON_DEPEND}
x11-libs/libxcb
