[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, kde-base/kdebase-pam/files/, kde-base/kdebase-pam/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, kde-base/kdebase-pam/files/, kde-base/kdebase-pam/, ...

[Johannes Huber]

commit:     8208b3e5881593eb8d5136b75c859ee75ec78e32
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 10:04:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 10:05:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8208b3e5

kde-base/kdebase-pam -> kde-plasma/kdebase-pam

 kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild         | 2 +-
 {kde-base => kde-plasma}/kdebase-pam/files/kde-np.pam-10   | 0
 {kde-base => kde-plasma}/kdebase-pam/files/kde.pam-10      | 0
 {kde-base => kde-plasma}/kdebase-pam/kdebase-pam-10.ebuild | 0
 {kde-base => kde-plasma}/kdebase-pam/metadata.xml          | 8 ++++----
 kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild        | 2 +-
 kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild        | 2 +-
 kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild        | 2 +-
 profiles/updates/4Q-2016                                   | 1 +
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild b/kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild
index 4a2efa8..ada60a3 100644
--- a/kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild
+++ b/kde-plasma/kcheckpass/kcheckpass-4.11.22-r1.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	pam? ( || (
-		>=kde-base/kdebase-pam-7
+		kde-plasma/kdebase-pam
 		kde-plasma/kscreenlocker:5
 	) )
 "

diff --git a/kde-base/kdebase-pam/files/kde-np.pam-10 b/kde-plasma/kdebase-pam/files/kde-np.pam-10
similarity index 100%
rename from kde-base/kdebase-pam/files/kde-np.pam-10
rename to kde-plasma/kdebase-pam/files/kde-np.pam-10

diff --git a/kde-base/kdebase-pam/files/kde.pam-10 b/kde-plasma/kdebase-pam/files/kde.pam-10
similarity index 100%
rename from kde-base/kdebase-pam/files/kde.pam-10
rename to kde-plasma/kdebase-pam/files/kde.pam-10

diff --git a/kde-base/kdebase-pam/kdebase-pam-10.ebuild b/kde-plasma/kdebase-pam/kdebase-pam-10.ebuild
similarity index 100%
rename from kde-base/kdebase-pam/kdebase-pam-10.ebuild
rename to kde-plasma/kdebase-pam/kdebase-pam-10.ebuild

diff --git a/kde-base/kdebase-pam/metadata.xml b/kde-plasma/kdebase-pam/metadata.xml
similarity index 55%
rename from kde-base/kdebase-pam/metadata.xml
rename to kde-plasma/kdebase-pam/metadata.xml
index 0cf5922..2fdbf33 100644
--- a/kde-base/kdebase-pam/metadata.xml
+++ b/kde-plasma/kdebase-pam/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild
index 620f638..bf24303 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.7.5.ebuild
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-base/kdebase-pam:0
+	!kde-plasma/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 888250e..241c840 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-base/kdebase-pam:0
+	!kde-plasma/kdebase-pam:0
 	!<kde-plasma/plasma-workspace-5.4.50
 "
 

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild
index 888250e..241c840 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-base/kdebase-pam:0
+	!kde-plasma/kdebase-pam:0
 	!<kde-plasma/plasma-workspace-5.4.50
 "
 

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 9e269f0..e221492 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -48,3 +48,4 @@ move media-libs/prison kde-frameworks/prison
 move kde-base/klipper kde-plasma/klipper
 move kde-base/ksmserver kde-plasma/ksmserver
 move kde-base/krunner kde-plasma/krunner
+move kde-base/kdebase-pam kde-plasma/kdebase-pam