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

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 385c8d7eaaf0440549c9919052c9bb2873e709b4..5e81940612e1489b21c33eb27acedbd5255f5858 100644 (file)
--- 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 3102f5ada40ca49465a71215b39bb3a2957a52d5..5bdb86f86addd5dd7e985ea648f18224c1ca8628 100644 (file)
--- 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 cce14d809d0e612363a52109fba36d71f6292a25..30fdc9fbf065af5945a2b1071c60c039793469c6 100644 (file)
--- 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 daaa02efe786d8eb09b2299a04dfaa2cfcda0247..9cec98e0540ed4668422549a21a6a4bfbecb40e7 100644 (file)
--- 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 7845e6788304969b6da895d3c1e41aa4dacc08da..aa080bf0f3edc63f36b52787e8b58c3ec359bdbb 100644 (file)
--- 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