commit: 368f7fb2208055025d17f3cc08b925490baf413a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 3 06:45:57 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 3 06:45:57 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=368f7fb2
[kde-base] Add appropriate kde-apps blockers.
---
kde-base/kinfocenter/kinfocenter-5.1.1.ebuild | 1 +
kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild | 1 +
kde-base/kinfocenter/kinfocenter-9999.ebuild | 1 +
kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild | 2 ++
kde-base/kio-extras/kio-extras-5.1.9999.ebuild | 2 ++
kde-base/kio-extras/kio-extras-9999.ebuild | 2 ++
kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild | 6 +++++-
kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild | 6 +++++-
kde-base/plasma-desktop/plasma-desktop-9999.ebuild | 6 +++++-
9 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild
b/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild
index f00ea90..f626b6f 100644
--- a/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
samba? ( net-fs/samba[server(+)] )
wayland? ( $(add_kdebase_dep kwayland) )
X? ( x11-libs/libX11 )
+ !kde-apps/kcontrol:4
!kde-base/kcontrol:4
!kde-base/kinfocenter:4
"
diff --git a/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild
b/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild
index 491691e..0bdc24b 100644
--- a/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
samba? ( net-fs/samba[server(+)] )
wayland? ( $(add_kdebase_dep kwayland) )
X? ( x11-libs/libX11 )
+ !kde-apps/kcontrol:4
!kde-base/kcontrol:4
!kde-base/kinfocenter:4
"
diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild
b/kde-base/kinfocenter/kinfocenter-9999.ebuild
index 491691e..0bdc24b 100644
--- a/kde-base/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-9999.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
samba? ( net-fs/samba[server(+)] )
wayland? ( $(add_kdebase_dep kwayland) )
X? ( x11-libs/libX11 )
+ !kde-apps/kcontrol:4
!kde-base/kcontrol:4
!kde-base/kinfocenter:4
"
diff --git a/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild
b/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild
index b8ed91a..0d0c1ca 100644
--- a/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild
@@ -49,6 +49,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ !kde-apps/kcontrol:4
+ !kde-apps/kdebase-kioslaves:4[-minimal(-)]
!kde-base/kcontrol:4
!kde-base/kdebase-kioslaves:4[-minimal(-)]
"
diff --git a/kde-base/kio-extras/kio-extras-5.1.9999.ebuild
b/kde-base/kio-extras/kio-extras-5.1.9999.ebuild
index 0984633..7950c82 100644
--- a/kde-base/kio-extras/kio-extras-5.1.9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.1.9999.ebuild
@@ -49,6 +49,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ !kde-apps/kcontrol:4
+ !kde-apps/kdebase-kioslaves:4[-minimal(-)]
!kde-base/kcontrol:4
!kde-base/kdebase-kioslaves:4[-minimal(-)]
"
diff --git a/kde-base/kio-extras/kio-extras-9999.ebuild
b/kde-base/kio-extras/kio-extras-9999.ebuild
index 0984633..7950c82 100644
--- a/kde-base/kio-extras/kio-extras-9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-9999.ebuild
@@ -49,6 +49,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ !kde-apps/kcontrol:4
+ !kde-apps/kdebase-kioslaves:4[-minimal(-)]
!kde-base/kcontrol:4
!kde-base/kdebase-kioslaves:4[-minimal(-)]
"
diff --git a/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
b/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
index cc6bca6..df925e9 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild
@@ -90,9 +90,13 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
sys-apps/accountsservice
+ !kde-apps/attica:4
!kde-base/attica:4
+ !kde-apps/kcontrol:4
!kde-base/kcontrol:4
- !kde-base/knetattach:4
+ !kde-apps/knetattach:4[-handbook(-)]
+ !kde-base/knetattach:4[-handbook(-)]
+ !kde-apps/kdepasswd:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4
!kde-base/plasma-workspace:4
diff --git a/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild
b/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild
index d6884e4..3693803 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild
@@ -90,9 +90,13 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
sys-apps/accountsservice
+ !kde-apps/attica:4
!kde-base/attica:4
+ !kde-apps/kcontrol:4
!kde-base/kcontrol:4
- !kde-base/knetattach:4
+ !kde-apps/knetattach:4[-handbook(-)]
+ !kde-base/knetattach:4[-handbook(-)]
+ !kde-apps/kdepasswd:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4
!kde-base/plasma-workspace:4
diff --git a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
index d6884e4..3693803 100644
--- a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
@@ -90,9 +90,13 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
sys-apps/accountsservice
+ !kde-apps/attica:4
!kde-base/attica:4
+ !kde-apps/kcontrol:4
!kde-base/kcontrol:4
- !kde-base/knetattach:4
+ !kde-apps/knetattach:4[-handbook(-)]
+ !kde-base/knetattach:4[-handbook(-)]
+ !kde-apps/kdepasswd:4
!kde-base/kdepasswd:4
!kde-base/solid-actions-kcm:4
!kde-base/plasma-workspace:4
