13 files changed, 5 insertions, 4 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index ba7114dcfd99..1102a6037a78 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -476,7 +476,7 @@ kde4-meta_change_cmakelists() {
 	case ${KMNAME} in
 		kde-workspace)
 			# COLLISION PROTECT section
-			# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
+			# Install the startkde script just once, as a part of kde-plasma/kdebase-startkde,
 			# not as a part of every package.
 			if [[ ${PN} != kdebase-startkde && -f CMakeLists.txt ]]; then
 				# The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-plasma/kdebase-startkde/Manifest
index db5163f83985..db5163f83985 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-plasma/kdebase-startkde/Manifest
diff --git a/kde-base/kdebase-startkde/files/KDE-4 b/kde-plasma/kdebase-startkde/files/KDE-4
index 86a49d88eec8..86a49d88eec8 100644
--- a/kde-base/kdebase-startkde/files/KDE-4
+++ b/kde-plasma/kdebase-startkde/files/KDE-4
diff --git a/kde-base/kdebase-startkde/files/agent-shutdown.sh b/kde-plasma/kdebase-startkde/files/agent-shutdown.sh
index 07cf74772b5b..07cf74772b5b 100644
--- a/kde-base/kdebase-startkde/files/agent-shutdown.sh
+++ b/kde-plasma/kdebase-startkde/files/agent-shutdown.sh
diff --git a/kde-base/kdebase-startkde/files/agent-startup.sh b/kde-plasma/kdebase-startkde/files/agent-startup.sh
index 4b99f6e8b63d..4b99f6e8b63d 100644
--- a/kde-base/kdebase-startkde/files/agent-startup.sh
+++ b/kde-plasma/kdebase-startkde/files/agent-startup.sh
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch b/kde-plasma/kdebase-startkde/files/gentoo-startkde4-4.patch
index 4d5177507700..4d5177507700 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch
+++ b/kde-plasma/kdebase-startkde/files/gentoo-startkde4-4.patch
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch b/kde-plasma/kdebase-startkde/files/kdebase-startkde-kscreen.patch
index 65644aff83a3..65644aff83a3 100644
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch
+++ b/kde-plasma/kdebase-startkde/files/kdebase-startkde-kscreen.patch
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-kwalletd-pam.patch b/kde-plasma/kdebase-startkde/files/kdebase-startkde-kwalletd-pam.patch
index c70a07f819a1..c70a07f819a1 100644
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-kwalletd-pam.patch
+++ b/kde-plasma/kdebase-startkde/files/kdebase-startkde-kwalletd-pam.patch
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 3529d01d96fe..7dc313aea2b0 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 KMNOMODULE="true"
 inherit kde4-meta prefix
 
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+DESCRIPTION="Script which starts a complete Plasma session, and associated scripts"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="crash-reporter +handbook minimal +wallpapers"
 
diff --git a/kde-base/kdebase-startkde/metadata.xml b/kde-plasma/kdebase-startkde/metadata.xml
index 93c00c0e6670..93c00c0e6670 100644
--- a/kde-base/kdebase-startkde/metadata.xml
+++ b/kde-plasma/kdebase-startkde/metadata.xml
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
index 8fed1fb7c66b..c8e4c3ad43c0 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/freespacenotifier:4
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
-	!kde-base/kdebase-startkde:4
+	!kde-plasma/kdebase-startkde:4
 	!kde-plasma/klipper:4
 	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
index e8b62fcee1fa..66b9e919ff91 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/freespacenotifier:4
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
-	!kde-base/kdebase-startkde:4
+	!kde-plasma/kdebase-startkde:4
 	!kde-plasma/klipper:4
 	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 35ebbf448a17..f82ef772707d 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -53,3 +53,4 @@ move kde-base/kactivities kde-frameworks/kactivities
 move kde-base/kdm kde-plasma/kdm
 move kde-base/plasma-workspace kde-plasma/plasma-workspace
 move dev-perl/extutils-pkgconfig dev-perl/ExtUtils-PkgConfig
+move kde-base/kdebase-startkde kde-plasma/kdebase-startkde