[gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e81d72c7d1383ade6cc1c4c22c85e88dbe32130b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 19:58:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 19:40:40 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e81d72c7

kde-plasma/kscreenlocker: Drop IUSE=pam

Upstream commit 132adacf3d01fc4adf8a873e0debc3adb17972ec

See also:
https://invent.kde.org/plasma/kscreenlocker/-/merge_requests/59#note_468401

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kscreenlocker/kscreenlocker-5.25.49.9999.ebuild | 21 ++++-----------------
 kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild  | 21 ++++-----------------
 2 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.25.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.25.49.9999.ebuild
index 8406545be9..191a884b95 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.25.49.9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.25.49.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="+pam"
+IUSE=""
 
 RESTRICT="test"
 
@@ -43,11 +43,11 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	sys-libs/pam
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
 "
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
@@ -65,14 +65,6 @@ src_prepare() {
 	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
 }
 
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
 src_test() {
 	# requires running environment
 	local myctestargs=(
@@ -84,11 +76,6 @@ src_test() {
 src_install() {
 	ecm_src_install
 
-	if use pam; then
-		newpamd "${FILESDIR}/kde.pam" kde
-		newpamd "${FILESDIR}/kde-np.pam" kde-np
-	else
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
 }

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index fa1d70fc8c..2f61d6d802 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="+pam"
+IUSE=""
 
 RESTRICT="test"
 
@@ -43,11 +43,11 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	sys-libs/pam
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
 "
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
@@ -65,14 +65,6 @@ src_prepare() {
 	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
 }
 
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
 src_test() {
 	# requires running environment
 	local myctestargs=(
@@ -84,11 +76,6 @@ src_test() {
 src_install() {
 	ecm_src_install
 
-	if use pam; then
-		newpamd "${FILESDIR}/kde.pam" kde
-		newpamd "${FILESDIR}/kde-np.pam" kde-np
-	else
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
 }