[gentoo-commits] proj/kde:master commit in: kde-base/kio-extras/

[Johannes Huber]

commit:     0e9a773d3828845cfce1523031a60ed6fd0addc1
Author:     Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Mon Aug 11 07:16:00 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 18:33:32 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0e9a773d

[kde-base/kio-extras] Block kde-base/kcontrol:4

Block kde-base/kcontrol:4 due to a conflict in the handbooks.

Package-Manager: portage-2.2.8-r1

---
 kde-base/kio-extras/kio-extras-5.0.0.ebuild    | 1 +
 kde-base/kio-extras/kio-extras-5.0.9999.ebuild | 1 +
 kde-base/kio-extras/kio-extras-9999.ebuild     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-base/kio-extras/kio-extras-5.0.0.ebuild 
b/kde-base/kio-extras/kio-extras-5.0.0.ebuild
index 21c216e..ddbd9e5 100644
--- a/kde-base/kio-extras/kio-extras-5.0.0.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.0.0.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
+       !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild 
b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
index 0bce8e3..fe9d5c6 100644
--- a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
+       !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-base/kio-extras/kio-extras-9999.ebuild 
b/kde-base/kio-extras/kio-extras-9999.ebuild
index 0bce8e3..fe9d5c6 100644
--- a/kde-base/kio-extras/kio-extras-9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-9999.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
+       !kde-base/kcontrol:4
        !kde-base/kdebase-kioslaves:4[-minimal(-)]
 "
 DEPEND="${COMMON_DEPEND}