From b9220914edcb79bfb2568362315abc3617ea2ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
Date: Thu, 22 May 2025 22:50:46 +0200
Subject: [PATCH] sci-mathematics/cubicle: use command -v
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/956455
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
 sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild       |  8 ++++++--
 .../cubicle/files/cubicle-1.2.0-which.patch           | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 sci-mathematics/cubicle/files/cubicle-1.2.0-which.patch

diff --git a/sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild b/sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild
index f7887394c08b9..210c395fb4dd7 100644
--- a/sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild
+++ b/sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,12 +21,16 @@ RDEPEND="
 	dev-ml/num:=
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	dev-ml/findlib
 	sys-apps/gawk
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-which.patch" )
+
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
diff --git a/sci-mathematics/cubicle/files/cubicle-1.2.0-which.patch b/sci-mathematics/cubicle/files/cubicle-1.2.0-which.patch
new file mode 100644
index 0000000000000..f29c338cacca3
--- /dev/null
+++ b/sci-mathematics/cubicle/files/cubicle-1.2.0-which.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -39,7 +39,7 @@ AC_CHECK_PROG(USEOCAMLFIND,ocamlfind,yes,no)
+ 
+ if test "$USEOCAMLFIND" = yes; then
+    OCAMLFINDLIB=$(ocamlfind printconf stdlib)
+-   OCAMLFIND=$(which ocamlfind)
++   OCAMLFIND=$(command -v ocamlfind)
+    if test "$OCAMLFINDLIB" != "$OCAMLLIB"; then
+     USEOCAMLFIND=no;
+     echo "but your ocamlfind is not compatible with your ocamlc:"