commit: dfbcb477e7ed01428c2030407e9e615dae359aa8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 11:38:33 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 11:38:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbcb477
kde-base/kdm -> kde-plasma/kdm
gnome-base/gnome-session/gnome-session-3.20.2.ebuild | 2 +-
gnome-base/gnome-session/gnome-session-3.22.1.ebuild | 2 +-
gnome-base/gnome-session/gnome-session-3.22.2.ebuild | 2 +-
kde-misc/kdmthemegenerator/kdmthemegenerator-0.8.ebuild | 4 ++--
{kde-base => kde-plasma}/kdm/Manifest | 0
{kde-base => kde-plasma}/kdm/files/kdm-4-gentoo-xinitrc.d.patch | 0
{kde-base => kde-plasma}/kdm/files/kdm-logrotate | 0
{kde-base => kde-plasma}/kdm/files/kdm.service | 0
{kde-base => kde-plasma}/kdm/kdm-4.11.22.ebuild | 2 +-
{kde-base => kde-plasma}/kdm/metadata.xml | 0
kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild | 2 +-
kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild | 2 +-
kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild | 2 +-
profiles/arch/arm/package.use.force | 2 +-
profiles/arch/powerpc/ppc64/package.use.force | 2 +-
profiles/updates/4Q-2016 | 1 +
x11-misc/xscreensaver/metadata.xml | 2 +-
x11-misc/xscreensaver/xscreensaver-5.34.ebuild | 4 ++--
x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild | 2 +-
x11-themes/redhat-artwork/metadata.xml | 2 +-
20 files changed, 17 insertions(+), 16 deletions(-)
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 a28b259..32422f3 100644
--- 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 036ba6c..7662ccc 100644
--- 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 c17ebc2..9d5b887 100644
--- 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 b7965d3..b6dd4ee 100644
--- 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 1ab6487..cee6373 100644
--- 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 81fc49b..f1a11ec 100644
--- 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 18dcab7..4aac73c 100644
--- 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 4db8012..580bd71 100644
--- 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 ec4084e..32008af 100644
--- 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 <[email protected]> (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 a5254e8..fef54d7 100644
--- a/profiles/arch/powerpc/ppc64/package.use.force
+++ b/profiles/arch/powerpc/ppc64/package.use.force
@@ -3,7 +3,7 @@
# $Id$
# Samuli Suominen <[email protected]> (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 f02dc21..4e9e4a3 100644
--- 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 9ba8f0e..e985ddb 100644
--- 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 4fb7946..d2818e4 100644
--- 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 6da7fad..dcaad6c 100644
--- 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 0cc4976..2d7bbd8 100644
--- 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>
