From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DEC1C158091 for ; Sun, 19 Jun 2022 09:06:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A840E0992; Sun, 19 Jun 2022 09:06:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7930E0992 for ; Sun, 19 Jun 2022 09:06:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A79C341370 for ; Sun, 19 Jun 2022 09:06:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4CA64F7 for ; Sun, 19 Jun 2022 09:06:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1655322040.e81d72c7d1383ade6cc1c4c22c85e88dbe32130b.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kscreenlocker/kscreenlocker-5.25.49.9999.ebuild kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild X-VCS-Directories: kde-plasma/kscreenlocker/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e81d72c7d1383ade6cc1c4c22c85e88dbe32130b X-VCS-Branch: master Date: Sun, 19 Jun 2022 09:06:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4069e7dc-ed9c-4e05-82b7-625f7a508b38 X-Archives-Hash: f3bdc162c69f210d99f7e87cf33b135d commit: e81d72c7d1383ade6cc1c4c22c85e88dbe32130b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 19:58:57 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }