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

2026-09-23 16:49:10 -07:00 · 2016-12-10 12:38:33 +01:00
parent 31f22913a9
commit dfbcb477e7
20 changed files with 17 additions and 16 deletions
--- 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
--- 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
--- 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
--- 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}
--- a/kde-plasma/kdm/Manifest
+++ b/kde-plasma/kdm/Manifest
--- a/kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch
+++ b/kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch
--- a/kde-plasma/kdm/files/kdm-logrotate
+++ b/kde-plasma/kdm/files/kdm-logrotate
--- a/kde-plasma/kdm/files/kdm.service
+++ b/kde-plasma/kdm/files/kdm.service
--- a/kde-plasma/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"

--- a/kde-plasma/kdm/metadata.xml
+++ b/kde-plasma/kdm/metadata.xml
--- 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
 }
--- 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
 }
--- 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}"
--- 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
--- 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

--- 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
--- 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>
--- 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
--- 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
--- 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>