commit: 6941dbd2a7392eac22e8cac0f41dc8cf75c77abe Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Tue Mar 11 18:43:42 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Tue Mar 11 18:55:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6941dbd2
app-emacs/proofgeneral: replace "which" with "command -v" Bug: https://github.com/ProofGeneral/PG/pull/812 Closes: https://bugs.gentoo.org/950240 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../files/proofgeneral-4.5-posix-no-which.patch | 40 ++++++++++++++++++++++ app-emacs/proofgeneral/proofgeneral-4.5.ebuild | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch b/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch new file mode 100644 index 000000000000..cd1ed1529407 --- /dev/null +++ b/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch @@ -0,0 +1,40 @@ +From 2dac06d9e3f8e66f1619585c86f05a538a75de08 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[email protected]> +Date: Mon, 24 Feb 2025 19:29:48 +0100 +Subject: [PATCH] Makefile: Replace "which" by POSIX "command -v" + +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 7a5df5602..b9b28aab5 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,7 @@ + + # Set this according to your version of Emacs. + # NB: this is also used to set default install path names below. +-EMACS=$(shell if [ -z "`which emacs`" ]; then echo "Emacs executable not found"; exit 1; else echo emacs; fi) ++EMACS=$(shell if [ -z "`command -v emacs`" ]; then echo "Emacs executable not found"; exit 1; else echo emacs; fi) + + # We default to /usr rather than /usr/local because installs of + # desktop and doc files under /usr/local are unlikely to work with +@@ -273,7 +273,7 @@ scripts: bashscripts perlscripts + + .PHONY: bashscripts + bashscripts: +- (bash="`which bash`"; \ ++ (bash="`command -v bash`"; \ + if [ -z "$$bash" ]; then \ + echo "Could not find bash - bash paths not checked" >&2; \ + exit 0; \ +@@ -281,7 +281,7 @@ bashscripts: + + .PHONY: perlscripts + perlscripts: +- (perl="`which perl`"; \ ++ (perl="`command -v perl`"; \ + if [ -z "$$perl" ]; then \ + echo "Could not find perl - perl paths not checked" >&2; \ + exit 0; \ diff --git a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild index 021c56340c58..a5ca4a5d9022 100644 --- a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild +++ b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,9 @@ KEYWORDS="amd64 ppc x86" PATCHES=( "${FILESDIR}"/${PN}-4.4-desktop.patch "${FILESDIR}"/${PN}-4.5-paths.patch + "${FILESDIR}"/${PN}-4.5-posix-no-which.patch ) + DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md ) SITEFILE="50${PN}-gentoo.el"
