[gentoo-commits] repo/gentoo:master commit in: kde-plasma/solid-actions-kcm/, kde-base/solid-actions-kcm/, ...

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/solid-actions-kcm/, kde-base/solid-actions-kcm/, ...

[Johannes Huber]

commit:     d456a3dbb18dd2a6f491ccfce5db76408e65149c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 13:34:48 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 13:34:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d456a3db

kde-base/solid-actions-kcm -> kde-plasma/solid-actions-kcm

 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild          | 2 +-
 kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild                 | 2 +-
 kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild                 | 2 +-
 {kde-base => kde-plasma}/solid-actions-kcm/Manifest                   | 0
 {kde-base => kde-plasma}/solid-actions-kcm/metadata.xml               | 0
 .../solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild                | 4 ++--
 profiles/updates/4Q-2016                                              | 1 +
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 385c8d7..5e81940 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -84,7 +84,6 @@ RDEPEND="
 		$(add_kdebase_dep libplasmagenericshell)
 		$(add_kdebase_dep libtaskmanager)
 		$(add_kdebase_dep qguiplatformplugin_kde)
-		$(add_kdebase_dep solid-actions-kcm)
 		kde-plasma/freespacenotifier:4
 		kde-plasma/khotkeys:4
 		kde-plasma/kinfocenter:4
@@ -92,6 +91,7 @@ RDEPEND="
 		kde-plasma/ksysguard:4
 		kde-plasma/kwrited:4
 		kde-plasma/powerdevil:4
+		kde-plasma/solid-actions-kcm:4
 	)
 	wallpapers? ( kde-plasma/plasma-workspace-wallpapers:5 )
 "

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
index 3102f5a..5bdb86f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
@@ -116,7 +116,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/knetattach[handbook]
 	!kde-base/plasma-desktop:4
 	!kde-base/plasma-workspace:4
-	!kde-base/solid-actions-kcm:4
+	!kde-plasma/solid-actions-kcm:4
 	!kde-plasma/systemsettings:4
 	!kde-misc/kcm_touchpad
 	!kde-misc/kcm-touchpad

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
index cce14d8..30fdc9f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
@@ -116,7 +116,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/knetattach[handbook]
 	!kde-base/plasma-desktop:4
 	!kde-base/plasma-workspace:4
-	!kde-base/solid-actions-kcm:4
+	!kde-plasma/solid-actions-kcm:4
 	!kde-plasma/systemsettings:4
 	!kde-misc/kcm_touchpad
 	!kde-misc/kcm-touchpad

diff --git a/kde-base/solid-actions-kcm/Manifest b/kde-plasma/solid-actions-kcm/Manifest
similarity index 100%
rename from kde-base/solid-actions-kcm/Manifest
rename to kde-plasma/solid-actions-kcm/Manifest

diff --git a/kde-base/solid-actions-kcm/metadata.xml b/kde-plasma/solid-actions-kcm/metadata.xml
similarity index 100%
rename from kde-base/solid-actions-kcm/metadata.xml
rename to kde-plasma/solid-actions-kcm/metadata.xml

diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild b/kde-plasma/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
similarity index 76%
rename from kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
rename to kde-plasma/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
index daaa02e..9cec98e 100644
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
+++ b/kde-plasma/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 
-DESCRIPTION="KDE control module for Solid actions"
+DESCRIPTION="KDE Plasma control module for Solid actions"
 HOMEPAGE="https://solid.kde.org"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 7845e67..aa080bf 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -27,3 +27,4 @@ slotmove dev-python/pyinsane 0 1
 move media-sound/kwave kde-apps/kwave
 move app-misc/ddctool app-misc/ddcutil
 move kde-base/freespacenotifier kde-plasma/freespacenotifier
+move kde-base/solid-actions-kcm kde-plasma/solid-actions-kcm