[gentoo-commits] repo/gentoo:master commit in: kde-plasma/khelpcenter/, kde-plasma/systemsettings/, kde-plasma/kwrited/, ...

[Michael Palimaka]

commit:     7a51fd75003d4a819ea5c9e953e4fee255d53971
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Sep 25 21:04:43 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 16:07:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a51fd75

kde-plasma: Relax blockers on kde-base (limit to slot 4)

So kde-sunset users can be happy again.

Package-Manager: portage-2.2.20.1

 kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild  |  2 +-
 .../kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild     |  2 +-
 kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild        |  2 +-
 kde-plasma/khotkeys/khotkeys-5.4.1.ebuild              |  4 ++--
 kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild        | 12 ++++++------
 kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild            |  2 +-
 kde-plasma/ksysguard/ksysguard-5.4.1.ebuild            |  2 +-
 kde-plasma/kwin/kwin-5.4.1.ebuild                      |  4 ++--
 kde-plasma/kwrited/kwrited-5.4.1.ebuild                |  2 +-
 kde-plasma/libksysguard/libksysguard-5.4.1.ebuild      |  2 +-
 kde-plasma/oxygen/oxygen-5.4.1.ebuild                  |  4 ++--
 kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild  |  8 ++++----
 .../plasma-workspace/plasma-workspace-5.4.1.ebuild     | 18 +++++++++---------
 kde-plasma/powerdevil/powerdevil-5.4.1.ebuild          |  4 ++--
 kde-plasma/systemsettings/systemsettings-5.4.1.ebuild  |  2 +-
 15 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
index 134fbf7..6fc2840 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/kde-gtk-config
+	!kde-base/kde-gtk-config:4
 	!kde-misc/kde-gtk-config
 "
 

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
index 8a20e24..a98160f 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	scim? ( app-i18n/scim )
 "
 RDEPEND="${DEPEND}
-	!kde-base/kdeplasma-addons
+	!kde-base/kdeplasma-addons:4
 "
 
 src_configure() {

diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
index 2804bf5..55a182f 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
@@ -38,5 +38,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khelpcenter
+	!kde-base/khelpcenter:4
 "

diff --git a/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
index 3e16b08..e1c0ff8 100644
--- a/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
@@ -36,8 +36,8 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khotkeys
-	!kde-base/systemsettings
+	!kde-base/khotkeys:4
+	!kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
 	x11-libs/libxcb

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
index 469f576..16df157 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
@@ -53,16 +53,16 @@ COMMON_DEPEND="
 	samba? ( net-fs/samba[server(+)] )
 	wayland? ( $(add_plasma_dep kwayland) )
 	X? ( x11-libs/libX11 )
-	!kde-base/kcontrol
-	!kde-base/kinfocenter
-	!kde-misc/about-distro
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep plasma)
 "
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kcontrol:4
+	!kde-base/kinfocenter:4
+	!kde-misc/about-distro
+"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
index 7c3adf2..01c1c78 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	hotkeys? ( $(add_plasma_dep khotkeys) )
 "
 RDEPEND="${DEPEND}
-	!kde-base/kmenuedit
+	!kde-base/kmenuedit:4
 "
 
 src_configure() {

diff --git a/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
index 09fb72a..29409db 100644
--- a/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	lm_sensors? ( sys-apps/lm_sensors )
 "
 RDEPEND="${DEPEND}
-	!kde-base/ksysguard
+	!kde-base/ksysguard:4
 "
 
 src_configure() {

diff --git a/kde-plasma/kwin/kwin-5.4.1.ebuild b/kde-plasma/kwin/kwin-5.4.1.ebuild
index 110df8c..83d3836 100644
--- a/kde-plasma/kwin/kwin-5.4.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.4.1.ebuild
@@ -64,8 +64,8 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
-	!kde-base/kwin
-	!kde-base/systemsettings
+	!kde-base/kwin:4
+	!kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/designer:5

diff --git a/kde-plasma/kwrited/kwrited-5.4.1.ebuild b/kde-plasma/kwrited/kwrited-5.4.1.ebuild
index 9289236..6021b96 100644
--- a/kde-plasma/kwrited/kwrited-5.4.1.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.4.1.ebuild
@@ -20,5 +20,5 @@ DEPEND="
 	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}
-	!kde-base/kwrited
+	!kde-base/kwrited:4
 "

diff --git a/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
index 5dbc12e..3caea63 100644
--- a/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-base/ksysguard:4
-	!kde-base/libksysguard
+	!kde-base/libksysguard:4
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)

diff --git a/kde-plasma/oxygen/oxygen-5.4.1.ebuild b/kde-plasma/oxygen/oxygen-5.4.1.ebuild
index d76d4c4..9c3541d 100644
--- a/kde-plasma/oxygen/oxygen-5.4.1.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.4.1.ebuild
@@ -28,8 +28,8 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
-	!kde-base/kdebase-cursors
-	!kde-base/oxygen
+	!kde-base/kdebase-cursors:4
+	!kde-base/oxygen:4
 "
 DEPEND="${RDEPEND}
 	$(add_frameworks_dep kservice)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
index af7d486..d488992 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
@@ -100,10 +100,10 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kcontrol
 	!kde-apps/kdepasswd
 	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop
-	!kde-base/plasma-workspace
-	!kde-base/solid-actions-kcm
-	!kde-base/systemsettings
+	!kde-base/plasma-desktop:4
+	!kde-base/plasma-workspace:4
+	!kde-base/solid-actions-kcm:4
+	!kde-base/systemsettings:4
 	!kde-misc/kcm_touchpad
 	!kde-misc/kcm-touchpad
 	!kde-plasma/kcm-touchpad

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
index cfcbd87..8d4b053 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
@@ -108,15 +108,15 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xset
 	x11-apps/xsetroot
 	!<kde-apps/kio-extras-5.4.0
-	!kde-base/freespacenotifier
-	!kde-base/libtaskmanager
-	!kde-base/kcminit
-	!kde-base/kdebase-startkde
-	!kde-base/klipper
-	!kde-base/krunner
-	!kde-base/ksmserver
-	!kde-base/ksplash
-	!kde-base/plasma-workspace
+	!kde-base/freespacenotifier:4
+	!kde-base/libtaskmanager:4
+	!kde-base/kcminit:4
+	!kde-base/kdebase-startkde:4
+	!kde-base/klipper:4
+	!kde-base/krunner:4
+	!kde-base/ksmserver:4
+	!kde-base/ksplash:4
+	!kde-base/plasma-workspace:4
 	!kde-plasma/kio-extras
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
index be249f3..615361e 100644
--- a/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
@@ -45,8 +45,8 @@ RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
 	!systemd? ( sys-auth/polkit-pkla-compat )
-	!kde-base/powerdevil
-	!kde-base/systemsettings[handbook]
+	!kde-base/powerdevil:4
+	!kde-base/systemsettings:4[handbook]
 "
 
 src_install() {

diff --git a/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
index 41c7025..ea615d7 100644
--- a/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
@@ -34,5 +34,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	gtk? ( $(add_plasma_dep kde-gtk-config) )
-	!kde-base/systemsettings
+	!kde-base/systemsettings:4
 "