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 AFBC01392E8 for ; Sun, 25 Jul 2021 05:42:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D62C4E0C3B; Sun, 25 Jul 2021 05:42:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BCAA4E0C3B for ; Sun, 25 Jul 2021 05:42:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 80945342A48 for ; Sun, 25 Jul 2021 05:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE16F7DF for ; Sun, 25 Jul 2021 05:42:40 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1627191757.f84c3871f3cc3e57f4267ee7bd2208af1c82789f.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild X-VCS-Directories: x11-misc/xscreensaver/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: f84c3871f3cc3e57f4267ee7bd2208af1c82789f X-VCS-Branch: master Date: Sun, 25 Jul 2021 05:42:40 +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: 05f07373-e4e0-4b17-ba9a-6e60646b3c3b X-Archives-Hash: 660dddaf451c18d1ea33b58ea7cd3234 commit: f84c3871f3cc3e57f4267ee7bd2208af1c82789f Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jul 25 05:42:22 2021 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jul 25 05:42:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84c3871 x11-misc/xscreensaver: packaging fix for LINGUAS & pam.d false positive error Closes: https://bugs.gentoo.org/803479 Signed-off-by: Robin H. Johnson gentoo.org> x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild index 10eae1bbfe2..fc75283e450 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild @@ -125,8 +125,19 @@ src_prepare() { eapply_user # Must be eauto*re*conf, to force the rebuild + # it is NOT an entirely normal autoconf so there is weirdness! eautoreconf eautoheader + + # Afterwards, fix the linguas + # doesn't populate @install_sh@ properly + # https://bugs.gentoo.org/803479 + # requires LINGUAS to trigger + sed -i.orig \ + -e "/^install_sh = /s!=.*!= ${S}/install-sh!g" \ + "${S}/po/Makefile.in.in" || die + grep -e install_sh \ + "${S}/po/Makefile.in.in" || die } src_configure() { @@ -183,7 +194,8 @@ src_compile() { } src_install() { - emake install_prefix="${D}" install + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" install if use fonts; then # Do not install fonts with unclear licensing @@ -200,6 +212,7 @@ src_install() { dodoc README{,.hacking} if use pam; then + rm -f "${ED}/etc/pam.d/xscreensaver" # install our version instead fperms 755 /usr/bin/${PN} pamd_mimic_system ${PN} auth fi