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 6bacc7890b98c8c814a26a0020c9b022401d1868..1865b974ad432d6160e241dbde6e141dce91622c 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
@@ -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 917b713ac0735b4fe189b86e4c660716884490fd..e4eac9b02b0be1683b54ff38d088961853b76815 100644 (file)
--- 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 aba8071643ea424ef35525ebd4e6fbf4ec9d5d4f..bee1ceed810631e3cc0d12620ad52f779c6777cb 100644 (file)
--- 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 38e0b1b64c0fc2659e53b4385598a8da845e35aa..f976c9577d36d8148571ef8c809df1ca3c0a07af 100644 (file)
--- 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 f241e7affd958daa18bb533b8147839bf1d821d9..4a2efa822b5a3175bee0e8a06559d6884784b60f 100644 (file)
--- 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 3c5d3955512608f2c5a63ba6480275f584714bab..620f63804146e76db4bd85de83b4b505e794d546 100644 (file)
--- 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 519db8d36c1be19930ff887464f7f337ce37e085..888250eb79d3fe5d00e99081aa23c187fb838035 100644 (file)
--- 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 e3ab08b1966cc320389b054189bc9486114cf047..a4ee6f12a9c96ef312e8d05137268f674f47d51a 100644 (file)
--- 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