commit:     e42969762748853d91279157ca2d851e27da74ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 07:18:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 07:18:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4296976

sci-mathematics/pspp: add note re which

Not backporting it for now b/c not worth the eautoreconf, I guess.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pspp/files/pspp-1.6.1-drop-which-tests.patch   | 28 ++++++++++++++++++++++
 sci-mathematics/pspp/pspp-1.6.1.ebuild             |  1 +
 2 files changed, 29 insertions(+)

diff --git a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch 
b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
new file mode 100644
index 000000000000..5303df4dc2e6
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
@@ -0,0 +1,28 @@
+https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=f0ac9253e8b84691cec17fc80422993949a91cc1
+
+From f0ac9253e8b84691cec17fc80422993949a91cc1 Mon Sep 17 00:00:00 2001
+From: Friedrich Beckmann <[email protected]>
+Date: Sun, 26 Jun 2022 09:07:18 +0200
+Subject: tests/atlocal.in - switched from which to command -v
+
+Sam James reported a possible future build problem due to the
+usage of the "which" command:
+
+https://savannah.gnu.org/bugs/?62675
+
+I replace "which" with "command -v" as proposed. Thanks for your
+support.
+
+Closes: 62675
+--- a/tests/atlocal.in
++++ b/tests/atlocal.in
+@@ -71,7 +71,7 @@ alias pspp='pspp --no-statrc'
+ # Avoids error messages during tests if $TERM is set to an unknown terminal.
+ TERM=; unset TERM
+ 
+-pspp_diff=`which diff`
++pspp_diff=`command -v diff`
+ if test X"$RUNNER" = Xwine; then
+     diff () {
+         $pspp_diff -w  "$@"
+cgit v1.1

diff --git a/sci-mathematics/pspp/pspp-1.6.1.ebuild 
b/sci-mathematics/pspp/pspp-1.6.1.ebuild
index 2fd9cf7edbdb..befeed9034a2 100644
--- a/sci-mathematics/pspp/pspp-1.6.1.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.1.ebuild
@@ -14,6 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Note: can drop test infra + which dep in next release!
 IUSE="doc examples gtk ncurses nls perl postgres test"
 RESTRICT="!test? ( test )"
 

Reply via email to