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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C12D515800A for ; Sat, 5 Aug 2023 22:29:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DEE02BC013; Sat, 5 Aug 2023 22:29:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB1062BC013 for ; Sat, 5 Aug 2023 22:29:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 155C5340E5A for ; Sat, 5 Aug 2023 22:29:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 732B4F0E for ; Sat, 5 Aug 2023 22:29:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691274510.98cb41a01f37e5161de5c6ae159d3dfe80c29376.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild x11-wm/fvwm3/fvwm3-9999.ebuild X-VCS-Directories: x11-wm/fvwm3/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 98cb41a01f37e5161de5c6ae159d3dfe80c29376 X-VCS-Branch: master Date: Sat, 5 Aug 2023 22:29:48 +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: cd2e6a0f-4da5-41f5-a4df-7232244d22b8 X-Archives-Hash: 6af57415bbf8890287052cbc96d42d59 commit: 98cb41a01f37e5161de5c6ae159d3dfe80c29376 Author: Sam James gentoo org> AuthorDate: Sat Aug 5 22:26:38 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 5 22:28:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cb41a0 x11-wm/fvwm3: fix shebang in /etc/X11/Sessions file A file in /etc/X11/Sessions with just the path that's *not* executable is fine, but if it's executable, it's reasonably treated as a script. Oops. Bug: https://bugs.gentoo.org/911787 Signed-off-by: Sam James gentoo.org> x11-wm/fvwm3/{fvwm3-9999.ebuild => fvwm3-1.0.7-r1.ebuild} | 8 +++++--- x11-wm/fvwm3/fvwm3-9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild similarity index 96% copy from x11-wm/fvwm3/fvwm3-9999.ebuild copy to x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild index 46cdabe5b388..897728504f51 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild @@ -141,9 +141,11 @@ src_compile() { src_install() { emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - dodir /etc/X11/Sessions - echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die - fperms a+x "/etc/X11/Sessions/${PN}" || die + exeinto /etc/X11/Sessions + newexe - ${PN} <<-EOF + #!/bin/sh + ${PN} + EOF python_scriptinto "/usr/bin" python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index 46cdabe5b388..897728504f51 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -141,9 +141,11 @@ src_compile() { src_install() { emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - dodir /etc/X11/Sessions - echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die - fperms a+x "/etc/X11/Sessions/${PN}" || die + exeinto /etc/X11/Sessions + newexe - ${PN} <<-EOF + #!/bin/sh + ${PN} + EOF python_scriptinto "/usr/bin" python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"