From: Johannes Huber <johu@gentoo.org>
Date: Sun, 20 Nov 2016 14:48:34 +0000 (+0100)
Subject: kde-base/kcheckpass -> kde-plasma/kcheckpass
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2b40b901fd89257ad0b835206201464d77943f92;p=gentoo.git

kde-base/kcheckpass -> kde-plasma/kcheckpass
---

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 6bacc7890b98..1865b974ad43 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -72,7 +72,6 @@ RDEPEND="
 	handbook? ( kde-apps/khelpcenter:* )
 	!minimal? (
 		$(add_kdeapps_dep kdepasswd)
-		$(add_kdebase_dep kcheckpass)
 		$(add_kdebase_dep kdebase-cursors)
 		$(add_kdebase_dep klipper)
 		$(add_kdebase_dep kstyles)
@@ -84,6 +83,7 @@ RDEPEND="
 		$(add_kdebase_dep libtaskmanager)
 		$(add_kdebase_dep qguiplatformplugin_kde)
 		kde-plasma/freespacenotifier:4
+		kde-plasma/kcheckpass:4
 		kde-plasma/kephal:4
 		kde-plasma/khotkeys:4
 		kde-plasma/kinfocenter:4
diff --git a/kde-base/kdm/kdm-4.11.22.ebuild b/kde-base/kdm/kdm-4.11.22.ebuild
index 917b713ac073..e4eac9b02b0b 100644
--- a/kde-base/kdm/kdm-4.11.22.ebuild
+++ b/kde-base/kdm/kdm-4.11.22.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$
 
@@ -27,7 +27,7 @@ DEPEND="
 	)
 	kerberos? ( virtual/krb5 )
 	pam? (
-		$(add_kdebase_dep kcheckpass)
+		kde-plasma/kcheckpass:4
 		virtual/pam
 	)
 	systemd? ( sys-apps/systemd )
diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild
index aba8071643ea..bee1ceed8106 100644
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-base/krunner/krunner-4.11.22.ebuild
@@ -14,10 +14,10 @@ IUSE="debug"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
-	$(add_kdebase_dep kcheckpass)
 	$(add_kdebase_dep ksmserver)
 	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep libplasmagenericshell)
+	kde-plasma/kcheckpass:4
 	kde-plasma/kephal:4
 	kde-plasma/ksysguard:4
 	!aqua? (
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
index 38e0b1b64c0f..f976c9577d36 100644
--- a/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
@@ -7,12 +7,12 @@ EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="KDE screensaver framework"
+DESCRIPTION="KDE Plasma screensaver framework"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kcheckpass)
+	kde-plasma/kcheckpass:4
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}"
diff --git a/kde-base/kcheckpass/Manifest b/kde-plasma/kcheckpass/Manifest
similarity index 100%
rename from kde-base/kcheckpass/Manifest
rename to kde-plasma/kcheckpass/Manifest
diff --git a/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch b/kde-plasma/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
similarity index 100%
rename from kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
rename to kde-plasma/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild b/kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild
similarity index 85%
rename from kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
rename to kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild
index f241e7affd95..4a2efa822b5a 100644
--- a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
+++ b/kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.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$
 
@@ -17,8 +17,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	pam? ( || (
 		>=kde-base/kdebase-pam-7
-		kde-plasma/kscreenlocker
-		<kde-plasma/plasma-workspace-5.4.50
+		kde-plasma/kscreenlocker:5
 	) )
 "
 
diff --git a/kde-base/kcheckpass/metadata.xml b/kde-plasma/kcheckpass/metadata.xml
similarity index 100%
rename from kde-base/kcheckpass/metadata.xml
rename to kde-plasma/kcheckpass/metadata.xml
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild
index 3c5d39555126..620f63804146 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!<kde-base/kcheckpass-4.11.22-r1:4
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
 	!kde-base/kdebase-pam:0
 	!<kde-plasma/plasma-workspace-5.4.50
 "
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
index 519db8d36c1b..888250eb79d3 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!<kde-base/kcheckpass-4.11.22-r1:4
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
 	!kde-base/kdebase-pam:0
 	!<kde-plasma/plasma-workspace-5.4.50
 "
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index e3ab08b1966c..a4ee6f12a9c9 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -29,3 +29,4 @@ move app-misc/ddctool app-misc/ddcutil
 move kde-base/freespacenotifier kde-plasma/freespacenotifier
 move kde-base/solid-actions-kcm kde-plasma/solid-actions-kcm
 move kde-base/kephal kde-plasma/kephal
+move kde-base/kcheckpass kde-plasma/kcheckpass