[gentoo-commits] repo/gentoo:master commit in: eclass/, kde-base/kdebase-startkde/, kde-plasma/kdebase-startkde/files/, ...

[gentoo-commits] repo/gentoo:master commit in: eclass/, kde-base/kdebase-startkde/, kde-plasma/kdebase-startkde/files/, ...

[Johannes Huber]

commit:     c83cb2cc7617e0784c2459a13e7fd6a134ccfd5c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 07:24:36 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 07:25:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83cb2cc

kde-base/kdebase-startkde -> kde-plasma/kdebase-startkde

 eclass/kde4-meta.eclass                                                 | 2 +-
 {kde-base => kde-plasma}/kdebase-startkde/Manifest                      | 0
 {kde-base => kde-plasma}/kdebase-startkde/files/KDE-4                   | 0
 {kde-base => kde-plasma}/kdebase-startkde/files/agent-shutdown.sh       | 0
 {kde-base => kde-plasma}/kdebase-startkde/files/agent-startup.sh        | 0
 .../kdebase-startkde/files/gentoo-startkde4-4.patch                     | 0
 .../kdebase-startkde/files/kdebase-startkde-kscreen.patch               | 0
 .../kdebase-startkde/files/kdebase-startkde-kwalletd-pam.patch          | 0
 .../kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild                 | 2 +-
 {kde-base => kde-plasma}/kdebase-startkde/metadata.xml                  | 0
 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild            | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild               | 2 +-
 profiles/updates/4Q-2016                                                | 1 +
 13 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index ba7114d..1102a60 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
similarity index 100%
rename from kde-base/kdebase-startkde/Manifest
rename to kde-plasma/kdebase-startkde/Manifest

diff --git a/kde-base/kdebase-startkde/files/KDE-4 b/kde-plasma/kdebase-startkde/files/KDE-4
similarity index 100%
rename from kde-base/kdebase-startkde/files/KDE-4
rename to 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
similarity index 100%
rename from kde-base/kdebase-startkde/files/agent-shutdown.sh
rename to 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
similarity index 100%
rename from kde-base/kdebase-startkde/files/agent-startup.sh
rename to 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
similarity index 100%
rename from kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch
rename to 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
similarity index 100%
rename from kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch
rename to 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
similarity index 100%
rename from kde-base/kdebase-startkde/files/kdebase-startkde-kwalletd-pam.patch
rename to 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
similarity index 97%
rename from kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
rename to kde-plasma/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 3529d01..7dc313a 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
similarity index 100%
rename from kde-base/kdebase-startkde/metadata.xml
rename to 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 8fed1fb..c8e4c3a 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 e8b62fc..66b9e91 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 35ebbf4..f82ef77 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