kde-base/ksmserver -> kde-plasma/ksmserver

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 fc7b6c81e23620576550a06e474c925f899c845c..65da84c8295012094c2e71dd9b2e5dd0214839b8 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
@@ -54,9 +54,9 @@ RDEPEND="
        $(add_kdeapps_dep renamedlg-plugins)
        $(add_kdeapps_dep solid-runtime)
        $(add_kdebase_dep krunner)
-       $(add_kdebase_dep ksmserver)
        $(add_kdebase_dep plasma-workspace)
        kde-plasma/kcminit:4
+       kde-plasma/ksmserver:4
        kde-plasma/ksplash:4
        kde-plasma/kstartupconfig:4
        kde-plasma/kwin:4

diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild
index 08548aae0e13568d77ed2a5e588d600daccb8e1d..f688eadc0ea2bf2e6b2e26ed9b67867d32d6957c 100644 (file)
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-base/krunner/krunner-4.11.22.ebuild
@@ -14,9 +14,9 @@ IUSE="debug"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
-       $(add_kdebase_dep ksmserver)
        kde-plasma/kcheckpass:4
        kde-plasma/kephal:4
+       kde-plasma/ksmserver:4
        kde-plasma/ksysguard:4
        kde-plasma/libkworkspace:4
        kde-plasma/libplasmagenericshell:4

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

diff --git a/kde-base/ksmserver/ksmserver-4.11.22.ebuild b/kde-plasma/ksmserver/ksmserver-4.11.22.ebuild
similarity index 90%
rename from kde-base/ksmserver/ksmserver-4.11.22.ebuild
rename to kde-plasma/ksmserver/ksmserver-4.11.22.ebuild
index 2f92cc895093e49c966251584e7ab6952ee56af0..d630f608e8c7f86e2d4aa145fb6c790f74301ee1 100644 (file)
--- a/kde-base/ksmserver/ksmserver-4.11.22.ebuild
+++ b/kde-plasma/ksmserver/ksmserver-4.11.22.ebuild
@@ -8,7 +8,7 @@ DECLARATIVE_REQUIRED="always"
 KMNAME="kde-workspace"
 inherit kde4-meta pax-utils
 
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
+DESCRIPTION="The reliable Plasma session manager that talks the standard X11R6"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 

diff --git a/kde-base/ksmserver/metadata.xml b/kde-plasma/ksmserver/metadata.xml
similarity index 55%
rename from kde-base/ksmserver/metadata.xml
rename to kde-plasma/ksmserver/metadata.xml
index 0cf59224b0096e033aa6d04930d5ad55e6f29a86..2fdbf33d963db81228cb30a4f1abf67dbe9c29f1 100644 (file)
--- a/kde-base/ksmserver/metadata.xml
+++ b/kde-plasma/ksmserver/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-       <email>kde@gentoo.org</email>
-       <name>Gentoo KDE Project</name>
-</maintainer>
+       <maintainer type="project">
+               <email>kde@gentoo.org</email>
+               <name>Gentoo KDE Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
index 29e04345705604da277f32da485396089f2cf0d9..df1fc282fe3bc460abf0ee120676395c2ed43669 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
@@ -112,7 +112,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kdebase-startkde:4
        !kde-plasma/klipper:4
        !kde-base/krunner:4
-       !kde-base/ksmserver:4
+       !kde-plasma/ksmserver:4
        !kde-plasma/ksplash:4
        !kde-base/plasma-workspace:4
 "

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 593eb91edc117a31af65cdae592c7f7ed2408fbc..39a8bb340c27c8abd9ba3cbaebb2579cb19b6237 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -112,7 +112,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kdebase-startkde:4
        !kde-plasma/klipper:4
        !kde-base/krunner:4
-       !kde-base/ksmserver:4
+       !kde-plasma/ksmserver:4
        !kde-plasma/ksplash:4
        !kde-base/plasma-workspace: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 20fc0b9d6d423a5c7563e54fee3f4f05c00ad805..84227da58edf449652830bcff8634241d3317f20 100644 (file)
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -111,7 +111,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kdebase-startkde:4
        !kde-plasma/klipper:4
        !kde-base/krunner:4
-       !kde-base/ksmserver:4
+       !kde-plasma/ksmserver:4
        !kde-plasma/ksplash:4
        !kde-base/plasma-workspace:4
 "

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 3f0151264675220e2ac8eced7999d3c0171af9bf..3478f37bfe760db3595b3b8fb98f5230f46e5c18 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -46,3 +46,4 @@ move kde-base/libplasmaclock kde-plasma/libplasmaclock
 move kde-base/libtaskmanager kde-plasma/libtaskmanager
 move media-libs/prison kde-frameworks/prison
 move kde-base/klipper kde-plasma/klipper
+move kde-base/ksmserver kde-plasma/ksmserver