summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kinfocenter/kinfocenter-5.1.1.ebuild1
-rw-r--r--kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild1
-rw-r--r--kde-base/kinfocenter/kinfocenter-9999.ebuild1
-rw-r--r--kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild2
-rw-r--r--kde-base/kio-extras/kio-extras-5.1.9999.ebuild2
-rw-r--r--kde-base/kio-extras/kio-extras-9999.ebuild2
-rw-r--r--kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild6
-rw-r--r--kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild6
-rw-r--r--kde-base/plasma-desktop/plasma-desktop-9999.ebuild6
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 f00ea903c22..f626b6fba23 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 491691e5b7c..0bdc24ba85a 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 491691e5b7c..0bdc24ba85a 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 b8ed91a5bae..0d0c1ca5a0f 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 0984633a257..7950c824b9e 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 0984633a257..7950c824b9e 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 cc6bca6b541..df925e94533 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 d6884e4b7dd..3693803f66c 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 d6884e4b7dd..3693803f66c 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