kde-base/kdm -> kde-plasma/kdm

diff --git a/gnome-base/gnome-session/gnome-session-3.20.2.ebuild b/gnome-base/gnome-session/gnome-session-3.20.2.ebuild
index a28b259be49f86125a943c10f5b114e1668f856c..32422f3314cfb78f1fac1bc5993dc17571a5beca 100644 (file)
--- a/gnome-base/gnome-session/gnome-session-3.20.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.20.2.ebuild
@@ -114,7 +114,7 @@ src_install() {
 pkg_postinst() {
        gnome2_pkg_postinst
 
-       if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+       if ! has_version gnome-base/gdm && ! has_version kde-plasma/kdm; then
                ewarn "If you use a custom .xinitrc for your X session,"
                ewarn "make sure that the commands in the xinitrc.d scripts are run."
        fi

diff --git a/gnome-base/gnome-session/gnome-session-3.22.1.ebuild b/gnome-base/gnome-session/gnome-session-3.22.1.ebuild
index 036ba6cd5058f0154e9e2bc6f5d7a8d5208f3f8c..7662cccbfdcd8f964ffc840aa1e42599c4b2828f 100644 (file)
--- a/gnome-base/gnome-session/gnome-session-3.22.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.22.1.ebuild
@@ -114,7 +114,7 @@ src_install() {
 pkg_postinst() {
        gnome2_pkg_postinst
 
-       if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+       if ! has_version gnome-base/gdm && ! has_version kde-plasma/kdm; then
                ewarn "If you use a custom .xinitrc for your X session,"
                ewarn "make sure that the commands in the xinitrc.d scripts are run."
        fi

diff --git a/gnome-base/gnome-session/gnome-session-3.22.2.ebuild b/gnome-base/gnome-session/gnome-session-3.22.2.ebuild
index c17ebc2463fb56bf1dd43a92b1b4f29f2ecb71e7..9d5b887c692a302bdc4150a3a59a10165a4a9d91 100644 (file)
--- a/gnome-base/gnome-session/gnome-session-3.22.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.22.2.ebuild
@@ -115,7 +115,7 @@ src_install() {
 pkg_postinst() {
        gnome2_pkg_postinst
 
-       if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+       if ! has_version gnome-base/gdm && ! has_version kde-plasma/kdm; then
                ewarn "If you use a custom .xinitrc for your X session,"
                ewarn "make sure that the commands in the xinitrc.d scripts are run."
        fi

diff --git a/kde-misc/kdmthemegenerator/kdmthemegenerator-0.8.ebuild b/kde-misc/kdmthemegenerator/kdmthemegenerator-0.8.ebuild
index b7965d3a98f1ec9e80ad94b9e893f3e1bcb2229b..b6dd4eecbe836960bd2b953cbb27598490e1f2b6 100644 (file)
--- a/kde-misc/kdmthemegenerator/kdmthemegenerator-0.8.ebuild
+++ b/kde-misc/kdmthemegenerator/kdmthemegenerator-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-       $(add_kdebase_dep kdm)
+       kde-plasma/kdm:4
 "
 
 S=${WORKDIR}/${MY_P}

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

diff --git a/kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch b/kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch
similarity index 100%
rename from kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch
rename to kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch

diff --git a/kde-base/kdm/files/kdm-logrotate b/kde-plasma/kdm/files/kdm-logrotate
similarity index 100%
rename from kde-base/kdm/files/kdm-logrotate
rename to kde-plasma/kdm/files/kdm-logrotate

diff --git a/kde-base/kdm/files/kdm.service b/kde-plasma/kdm/files/kdm.service
similarity index 100%
rename from kde-base/kdm/files/kdm.service
rename to kde-plasma/kdm/files/kdm.service

diff --git a/kde-base/kdm/kdm-4.11.22.ebuild b/kde-plasma/kdm/kdm-4.11.22.ebuild
similarity index 98%
rename from kde-base/kdm/kdm-4.11.22.ebuild
rename to kde-plasma/kdm/kdm-4.11.22.ebuild
index 1ab6487d751678fa6e646bff9aeb8b4bfe5233ec..cee6373e0561d235951a137776c3bdfe5b3964b6 100644 (file)
--- a/kde-base/kdm/kdm-4.11.22.ebuild
+++ b/kde-plasma/kdm/kdm-4.11.22.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit systemd kde4-meta flag-o-matic user
 
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
+DESCRIPTION="Login manager by KDE, similar to xdm and gdm"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug +consolekit kerberos pam systemd"
 

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

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
index 81fc49b1124880a248c9f3f3aa66514d1b20f5f6..f1a11ec155af9ae684be1955fdd10b5ccd1af871 100644 (file)
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
@@ -90,6 +90,6 @@ pkg_postinst() {
        elog "4.b Checking installed DMs..."
        has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
        has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-       has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+       has_version "kde-plasma/kdm" && check_dm "KDM" "/etc/pam.d/kde"
        elog
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
index 18dcab74b2640266deae895b4de25cd7cc63ed75..4aac73ca0c1ee6393e89e0e885053d2a8feabbd6 100644 (file)
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
@@ -90,6 +90,6 @@ pkg_postinst() {
        elog "4.b Checking installed DMs..."
        has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
        has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-       has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+       has_version "kde-plasma/kdm" && check_dm "KDM" "/etc/pam.d/kde"
        elog
 }

diff --git a/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild b/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild
index 4db80128ab5324f61cf2664462b978b8439ac2ae..580bd71cb7c26087e85724df8c2c56108dbc13fc 100644 (file)
--- a/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild
+++ b/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-       !<kde-base/kdm-4.11.17-r1:4
+       !<kde-plasma/kdm-4.11.17-r1:4
 "
 
 RDEPEND="${DEPEND}"

diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index ec4084e74d5ad894e111d9782f0fcfd61b276956..32008af1cfcb59cf5da5d75a882bb0abd68ee1d2 100644 (file)
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -8,6 +8,6 @@ sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
 
 # Anthony G. Basile <blueness@gentoo.org> (11 Nov 2012)
-# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-base/kdm
+# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm
 # gets stable keyword, this line can be removed.
 x11-misc/xscreensaver gdm

diff --git a/profiles/arch/powerpc/ppc64/package.use.force b/profiles/arch/powerpc/ppc64/package.use.force
index a5254e8f36e0b6d2294c08b13e89fb1308c57d02..fef54d70b3a2d3e64f83592dce5ee96c95d58374 100644 (file)
--- a/profiles/arch/powerpc/ppc64/package.use.force
+++ b/profiles/arch/powerpc/ppc64/package.use.force
@@ -3,7 +3,7 @@
 # $Id$
 
 # Samuli Suominen <ssuominen@gentoo.org> (30 Oct 2012)
-# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-base/kdm gets
+# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm gets
 # stable keyword, this line can be removed.
 x11-misc/xscreensaver gdm
 

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index f02dc21206a3911f8f81aaeb2e07ae546245fc08..4e9e4a36f0608cbd02af953492cc089071f2d984 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -50,3 +50,4 @@ move kde-base/ksmserver kde-plasma/ksmserver
 move kde-base/krunner kde-plasma/krunner
 move kde-base/kdebase-pam kde-plasma/kdebase-pam
 move kde-base/kactivities kde-frameworks/kactivities
+move kde-base/kdm kde-plasma/kdm

diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 9ba8f0eb61e1119aefaec653c232103891a1bf96..e985ddbacf039c42e7c47147a5db6df557997c5b 100644 (file)
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -13,6 +13,6 @@
   </upstream>
   <use>
     <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
-    <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>) or kdmctl (<pkg>kde-base/kdm</pkg>)</flag>
+    <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>) or kdmctl (<pkg>kde-plasma/kdm</pkg>)</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-misc/xscreensaver/xscreensaver-5.34.ebuild b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild
index 4fb794687c80cc41f872f8e0aa74a1b29c4dfd96..d2818e433a20b954f4a61f6d4834033f62c7b467 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.34.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.34.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$
 
@@ -34,7 +34,7 @@ COMMON_DEPEND="
        jpeg? ( virtual/jpeg:0 )
        new-login? (
                gdm? ( gnome-base/gdm )
-               !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+               !gdm? ( || ( x11-misc/lightdm kde-plasma/kdm ) )
                )
        opengl? (
                virtual/glu

diff --git a/x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild
index 6da7fadabed3401e4c966b40a708ff7fc52f4f0d..dcaad6ce0c972a9e9183c6c06f6b647a77658792 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
        jpeg? ( virtual/jpeg:0 )
        new-login? (
                gdm? ( gnome-base/gdm )
-               !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+               !gdm? ( || ( x11-misc/lightdm kde-plasma/kdm ) )
                )
        opengl? (
                virtual/glu

diff --git a/x11-themes/redhat-artwork/metadata.xml b/x11-themes/redhat-artwork/metadata.xml
index 0cc4976d49f25bb6d229220784f7e77a8cef2722..2d7bbd8fb39b37a8012d939b44a0a44941028512 100644 (file)
--- a/x11-themes/redhat-artwork/metadata.xml
+++ b/x11-themes/redhat-artwork/metadata.xml
@@ -10,7 +10,7 @@
 <flag name="cursors">Install Bluecurve cursors</flag>
 <flag name="gdm">Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
 <flag name="icons">Install Bluecurve icons</flag>
-<flag name="kdm">Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
+<flag name="kdm">Install Bluecurve <pkg>kde-plasma/kdm</pkg> theme</flag>
 <flag name="nautilus">Install Bluecurve <pkg>gnome-base/nautilus</pkg> icons</flag>
 </use>
 </pkgmetadata>