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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17B77138359 for ; Sun, 2 Aug 2020 11:16:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA831E0C4C; Sun, 2 Aug 2020 11:16:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C04EBE0C4C for ; Sun, 2 Aug 2020 11:16:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 867BE34F03A for ; Sun, 2 Aug 2020 11:16:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4076A300 for ; Sun, 2 Aug 2020 11:16:04 +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: <1596359486.26b08519de027fcb94691e9f00dd95494549e382.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.19.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: 26b08519de027fcb94691e9f00dd95494549e382 X-VCS-Branch: master Date: Sun, 2 Aug 2020 11:16:04 +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: 039071de-d358-4018-8f26-ee70e1564b22 X-Archives-Hash: 05542c53931b0d9623accf40d56f3473 commit: 26b08519de027fcb94691e9f00dd95494549e382 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 2 09:11:26 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 2 09:11:26 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=26b08519 kde-plasma/kscreenlocker: Simplify src_install Although the days of keeping this optional are likely numbered. Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild | 8 ++++---- kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild index 0444ad8715..5b008a5dd9 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild @@ -89,10 +89,10 @@ src_configure() { src_install() { ecm_src_install - use pam && newpamd "${FILESDIR}/kde.pam" kde - use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np - - if ! use pam; then + 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 diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index c9ae349e4a..7c11bbb222 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -87,10 +87,10 @@ src_configure() { src_install() { ecm_src_install - use pam && newpamd "${FILESDIR}/kde.pam" kde - use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np - - if ! use pam; then + 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