user/*: use generic 'which' instead of forcing debianutils implementation. closes !642.

92 files changed, 92 insertions, 92 deletions

diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD
index 33771f7b8..4354092c1 100644
--- a/user/aspell-dict-af/APKBUILD
+++ b/user/aspell-dict-af/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="LGPL-2.1-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-af-$_pkgver"
 
diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD
index 655453f04..5aa0440a4 100644
--- a/user/aspell-dict-am/APKBUILD
+++ b/user/aspell-dict-am/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="Public-Domain"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-am-$_pkgver"
 
diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD
index ab2fa8016..aa2bdd6ca 100644
--- a/user/aspell-dict-ar/APKBUILD
+++ b/user/aspell-dict-ar/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-ar-$_pkgver"
 
diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD
index c3302a23f..5885c41fc 100644
--- a/user/aspell-dict-ast/APKBUILD
+++ b/user/aspell-dict-ast/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="LGPL-2.1-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$pkgver.tar.bz2"
 builddir="$srcdir/aspell6-ast-$pkgver"
 
diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD
index a97386923..b03c15cc6 100644
--- a/user/aspell-dict-az/APKBUILD
+++ b/user/aspell-dict-az/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-az-$_pkgver"
 
diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD
index 9846afced..55b3091f6 100644
--- a/user/aspell-dict-be/APKBUILD
+++ b/user/aspell-dict-be/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="LGPL-2.1-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$pkgver.tar.bz2"
 builddir="$srcdir/aspell5-be-$pkgver"
 
diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD
index 7fdfb97e9..86f154885 100644
--- a/user/aspell-dict-bg/APKBUILD
+++ b/user/aspell-dict-bg/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-bg-$_pkgver"
 
diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD
index 62e396f3f..014e13ec0 100644
--- a/user/aspell-dict-bn/APKBUILD
+++ b/user/aspell-dict-bn/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-bn-$_pkgver"
 
diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD
index 8708d2806..805ce8c63 100644
--- a/user/aspell-dict-br/APKBUILD
+++ b/user/aspell-dict-br/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-br-$_pkgver"
 
diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD
index d1dcf07d3..865bc7c08 100644
--- a/user/aspell-dict-ca/APKBUILD
+++ b/user/aspell-dict-ca/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://www.softcatala.org/pub/softcatala/aspell/$pkgver/aspell6-ca-$pkgver.tar.bz2"
 builddir="$srcdir/aspell6-ca-$pkgver"
 
diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD
index 0cddbb21d..68f724887 100644
--- a/user/aspell-dict-cs/APKBUILD
+++ b/user/aspell-dict-cs/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-cs-$_pkgver"
 
diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD
index 09f890e06..27fd90f3d 100644
--- a/user/aspell-dict-csb/APKBUILD
+++ b/user/aspell-dict-csb/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-csb-$_pkgver"
 
diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD
index d357d42dd..3533f813a 100644
--- a/user/aspell-dict-cy/APKBUILD
+++ b/user/aspell-dict-cy/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-cy-$_pkgver"
 
diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD
index e89c676ee..5907a8264 100644
--- a/user/aspell-dict-da/APKBUILD
+++ b/user/aspell-dict-da/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/da/aspell5-da-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-da-$_pkgver"
 
diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD
index 61fb0f6fd..57e2b1d30 100644
--- a/user/aspell-dict-de-alt/APKBUILD
+++ b/user/aspell-dict-de-alt/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/de-alt/aspell6-de-alt-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-de-alt-$_pkgver"
 
diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD
index 0ae31545c..9f669ea75 100644
--- a/user/aspell-dict-de/APKBUILD
+++ b/user/aspell-dict-de/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2"
 builddir="$srcdir/igerman98-$pkgver"
 _langs="de_DE de_AT de_CH"
diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD
index ad8db028a..3bc5f803f 100644
--- a/user/aspell-dict-el/APKBUILD
+++ b/user/aspell-dict-el/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-el-$_pkgver"
 
diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD
index a5abbf22a..15f2719e5 100644
--- a/user/aspell-dict-en/APKBUILD
+++ b/user/aspell-dict-en/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="BSD-3-Clause AND Public-Domain"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-en-$_pkgver"
 
diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD
index 5bf6ffd88..89518d3da 100644
--- a/user/aspell-dict-eo/APKBUILD
+++ b/user/aspell-dict-eo/APKBUILD
@@ -11,7 +11,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-eo-$_pkgver"
 
diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD
index f9bafde42..6607b217d 100644
--- a/user/aspell-dict-es/APKBUILD
+++ b/user/aspell-dict-es/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-es-$_pkgver"
 
diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD
index bb7c77612..4b5dbd8d5 100644
--- a/user/aspell-dict-et/APKBUILD
+++ b/user/aspell-dict-et/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-et-$_pkgver"
 
diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD
index e84e0c811..d8cad0df9 100644
--- a/user/aspell-dict-fa/APKBUILD
+++ b/user/aspell-dict-fa/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-fa-$_pkgver"
 
diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD
index 67bc18365..87b27d80c 100644
--- a/user/aspell-dict-fi/APKBUILD
+++ b/user/aspell-dict-fi/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-fi-$_pkgver"
 
diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD
index c186949bd..4c0e297c2 100644
--- a/user/aspell-dict-fo/APKBUILD
+++ b/user/aspell-dict-fo/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/fo/aspell5-fo-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-fo-$_pkgver"
 
diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD
index 335931c8a..afc328c15 100644
--- a/user/aspell-dict-fr/APKBUILD
+++ b/user/aspell-dict-fr/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-fr-$_pkgver"
 
diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD
index d42f5fced..0a9db5f09 100644
--- a/user/aspell-dict-fy/APKBUILD
+++ b/user/aspell-dict-fy/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-fy-$_pkgver"
 
diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD
index a6b610c0c..ae7f7a174 100644
--- a/user/aspell-dict-ga/APKBUILD
+++ b/user/aspell-dict-ga/APKBUILD
@@ -11,7 +11,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://github.com/kscanne/gaelspell/releases/download/v$_pkgver2/aspell5-ga-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-ga-$_pkgver"
 
diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD
index 29238c28c..0e7506450 100644
--- a/user/aspell-dict-gd/APKBUILD
+++ b/user/aspell-dict-gd/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-gd-$_pkgver"
 
diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD
index 2e4f630d5..b2a1cad3a 100644
--- a/user/aspell-dict-gl/APKBUILD
+++ b/user/aspell-dict-gl/APKBUILD
@@ -11,7 +11,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-gl-$_pkgver"
 
diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD
index 7ad9ac316..21aeb16cf 100644
--- a/user/aspell-dict-grc/APKBUILD
+++ b/user/aspell-dict-grc/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-grc-$_pkgver"
 
diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD
index 95d3df597..d76b57d32 100644
--- a/user/aspell-dict-gu/APKBUILD
+++ b/user/aspell-dict-gu/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-gu-$_pkgver"
 
diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD
index 022042c0a..9fb63f1ea 100644
--- a/user/aspell-dict-gv/APKBUILD
+++ b/user/aspell-dict-gv/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-gv-$_pkgver"
 
diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD
index 5052052c5..0a6763cc2 100644
--- a/user/aspell-dict-he/APKBUILD
+++ b/user/aspell-dict-he/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-he-$_pkgver"
 
diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD
index 7be1a71e8..8cb4713ef 100644
--- a/user/aspell-dict-hi/APKBUILD
+++ b/user/aspell-dict-hi/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-hi-$_pkgver"
 
diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD
index 13be13861..85ed57e12 100644
--- a/user/aspell-dict-hil/APKBUILD
+++ b/user/aspell-dict-hil/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-hil-$_pkgver"
 
diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD
index 1b73b5274..4b62af1a2 100644
--- a/user/aspell-dict-hr/APKBUILD
+++ b/user/aspell-dict-hr/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-hr-$_pkgver"
 
diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD
index 9c47957de..118038354 100644
--- a/user/aspell-dict-hsb/APKBUILD
+++ b/user/aspell-dict-hsb/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-hsb-$_pkgver"
 
diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD
index 9973ca8ed..25110c764 100644
--- a/user/aspell-dict-hu/APKBUILD
+++ b/user/aspell-dict-hu/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-hu-$_pkgver"
 
diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD
index a33f44136..bf2417ef4 100644
--- a/user/aspell-dict-hus/APKBUILD
+++ b/user/aspell-dict-hus/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-hus-$_pkgver"
 
diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD
index da7a6ca99..13fc2f181 100644
--- a/user/aspell-dict-hy/APKBUILD
+++ b/user/aspell-dict-hy/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-hy-$_pkgver"
 
diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD
index 908b26610..61737eb9b 100644
--- a/user/aspell-dict-ia/APKBUILD
+++ b/user/aspell-dict-ia/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-ia-$_pkgver"
 
diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD
index 28fce71e1..e5f4b0c55 100644
--- a/user/aspell-dict-id/APKBUILD
+++ b/user/aspell-dict-id/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-id-$_pkgver"
 
diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD
index 6e096c434..391d629a8 100644
--- a/user/aspell-dict-is/APKBUILD
+++ b/user/aspell-dict-is/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-is-$_pkgver"
 
diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD
index 6b9acdfb8..e7d7d3395 100644
--- a/user/aspell-dict-it/APKBUILD
+++ b/user/aspell-dict-it/APKBUILD
@@ -11,7 +11,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://downloads.sourceforge.net/linguistico/aspell6-it-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-it-$_pkgver"
 
diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD
index a4885a08a..7be633313 100644
--- a/user/aspell-dict-kn/APKBUILD
+++ b/user/aspell-dict-kn/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-kn-$_pkgver"
 
diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD
index 6fd0e03e0..c03aa0472 100644
--- a/user/aspell-dict-ku/APKBUILD
+++ b/user/aspell-dict-ku/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-ku-$_pkgver"
 
diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD
index 68176d858..b99991a27 100644
--- a/user/aspell-dict-ky/APKBUILD
+++ b/user/aspell-dict-ky/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-ky-$_pkgver"
 
diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD
index 24aa053c7..c3ad40249 100644
--- a/user/aspell-dict-la/APKBUILD
+++ b/user/aspell-dict-la/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2"
 builddir="$srcdir/aspell6-la-$_pkgver"
 
diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD
index 1eefd3d59..f3fba0fe7 100644
--- a/user/aspell-dict-lt/APKBUILD
+++ b/user/aspell-dict-lt/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://launchpad.net/ispell-lt/main/$pkgver/+download/aspell6-lt-$pkgver.tar.bz2"
 builddir="$srcdir/aspell6-lt-$pkgver"
 
diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD
index 4ad0da3a2..a750d044b 100644
--- a/user/aspell-dict-lv/APKBUILD
+++ b/user/aspell-dict-lv/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-lv-$_pkgver"
 
diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD
index fb04eb1e4..ab1b467ce 100644
--- a/user/aspell-dict-mg/APKBUILD
+++ b/user/aspell-dict-mg/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-mg-$_pkgver"
 
diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD
index 8cea7a75d..adf9bf937 100644
--- a/user/aspell-dict-mi/APKBUILD
+++ b/user/aspell-dict-mi/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-mi-$_pkgver"
 
diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD
index 1d8960fb9..8a591e1dc 100644
--- a/user/aspell-dict-mk/APKBUILD
+++ b/user/aspell-dict-mk/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-mk-$_pkgver"
 
diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD
index c296d6f41..6e169f47b 100644
--- a/user/aspell-dict-ml/APKBUILD
+++ b/user/aspell-dict-ml/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="http://gnu.mirrors.pair.com/savannah/savannah/smc/Spellchecker/aspell6-ml-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-ml-$_pkgver"
 
diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD
index a76245c20..79f73adc5 100644
--- a/user/aspell-dict-mn/APKBUILD
+++ b/user/aspell-dict-mn/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-mn-$_pkgver"
 
diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD
index 31f17d31d..2938df18a 100644
--- a/user/aspell-dict-mr/APKBUILD
+++ b/user/aspell-dict-mr/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-mr-$_pkgver"
 
diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD
index 9e66bdcc8..daf92146c 100644
--- a/user/aspell-dict-ms/APKBUILD
+++ b/user/aspell-dict-ms/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-ms-$_pkgver"
 
diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD
index 88b601f80..7dfdbf1d1 100644
--- a/user/aspell-dict-mt/APKBUILD
+++ b/user/aspell-dict-mt/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-mt-$_pkgver"
 
diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD
index cfc57385a..75d39392c 100644
--- a/user/aspell-dict-nb/APKBUILD
+++ b/user/aspell-dict-nb/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-nb-$_pkgver"
 
diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD
index 40ff55d26..4e84f1b9a 100644
--- a/user/aspell-dict-nds/APKBUILD
+++ b/user/aspell-dict-nds/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-nds-$_pkgver"
 
diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD
index 3d2a99759..2990384f5 100644
--- a/user/aspell-dict-nl/APKBUILD
+++ b/user/aspell-dict-nl/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-nl-$_pkgver"
 
diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD
index 2f5f6a8b1..dd2706e5e 100644
--- a/user/aspell-dict-nn/APKBUILD
+++ b/user/aspell-dict-nn/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-nn-$_pkgver"
 
diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD
index cb998d970..c3ad5c5f9 100644
--- a/user/aspell-dict-ny/APKBUILD
+++ b/user/aspell-dict-ny/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-ny-$_pkgver"
 
diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD
index 6f7a0790f..3e42ddf72 100644
--- a/user/aspell-dict-or/APKBUILD
+++ b/user/aspell-dict-or/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-or-$_pkgver"
 
diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD
index 089033fcd..16fed157f 100644
--- a/user/aspell-dict-pa/APKBUILD
+++ b/user/aspell-dict-pa/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-pa-$_pkgver"
 
diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD
index 209a45d47..d5da98bf8 100644
--- a/user/aspell-dict-pl/APKBUILD
+++ b/user/aspell-dict-pl/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://dev.sick.bike/dist/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz"2
 builddir="$srcdir/aspell6-pl-6.0_$pkgver-0"
 
diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD
index 7200d86de..4f4a3a0ec 100644
--- a/user/aspell-dict-pt_BR/APKBUILD
+++ b/user/aspell-dict-pt_BR/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-pt_BR-$_pkgver"
 
diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD
index 3b25dc636..e25f670c0 100644
--- a/user/aspell-dict-pt_PT/APKBUILD
+++ b/user/aspell-dict-pt_PT/APKBUILD
@@ -11,7 +11,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-pt_PT-$_pkgver"
 
diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD
index f699cd6e4..fd4e84f14 100644
--- a/user/aspell-dict-qu/APKBUILD
+++ b/user/aspell-dict-qu/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-qu-$_pkgver"
 
diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD
index 76888dca9..f5a63f141 100644
--- a/user/aspell-dict-ro/APKBUILD
+++ b/user/aspell-dict-ro/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://download.sourceforge.net/rospell/aspell5-ro-$pkgver.tar.bz2"
 builddir="$srcdir/aspell5-ro-$pkgver"
 
diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD
index 1605b63a6..385238fc6 100644
--- a/user/aspell-dict-ru/APKBUILD
+++ b/user/aspell-dict-ru/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2"
 builddir="$srcdir/aspell6-ru-$_pkgver"
 
diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD
index 9708ede9e..72d08e182 100644
--- a/user/aspell-dict-rw/APKBUILD
+++ b/user/aspell-dict-rw/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-rw-$_pkgver"
 
diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD
index b0ea6622b..ecc3bf8c0 100644
--- a/user/aspell-dict-sc/APKBUILD
+++ b/user/aspell-dict-sc/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$pkgver.tar.bz2"
 builddir="$srcdir/aspell5-sc-$pkgver"
 
diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD
index ae5a93b65..9aba2243d 100644
--- a/user/aspell-dict-sk/APKBUILD
+++ b/user/aspell-dict-sk/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://distfiles.adelielinux.org/source/aspell6-sk-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-sk-$_pkgver"
 
diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD
index 54fb43e88..8cfeb5dd8 100644
--- a/user/aspell-dict-sl/APKBUILD
+++ b/user/aspell-dict-sl/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-sl-$_pkgver"
 
diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD
index fbebf7bcb..3751fe605 100644
--- a/user/aspell-dict-sr/APKBUILD
+++ b/user/aspell-dict-sr/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$pkgver.tar.bz2"
 builddir="$srcdir/aspell6-sr-$pkgver"
 
diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD
index 44a508d69..d7c154ff6 100644
--- a/user/aspell-dict-sv/APKBUILD
+++ b/user/aspell-dict-sv/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-sv-$_pkgver"
 
diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD
index 72e531448..890b6eddc 100644
--- a/user/aspell-dict-sw/APKBUILD
+++ b/user/aspell-dict-sw/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-sw-$_pkgver"
 
diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD
index a5044a9a2..840c27960 100644
--- a/user/aspell-dict-ta/APKBUILD
+++ b/user/aspell-dict-ta/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-ta-$_pkgver"
 
diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD
index f03f054e2..444388d5c 100644
--- a/user/aspell-dict-te/APKBUILD
+++ b/user/aspell-dict-te/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-te-$_pkgver"
 
diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD
index 810cffb49..4bd7bb1d3 100644
--- a/user/aspell-dict-tet/APKBUILD
+++ b/user/aspell-dict-tet/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$pkgver.tar.bz2"
 builddir="$srcdir/aspell5-tet-$pkgver"
 
diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD
index dcaf12fcb..8b9a37bc2 100644
--- a/user/aspell-dict-tk/APKBUILD
+++ b/user/aspell-dict-tk/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-tk-$_pkgver"
 
diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD
index f2e3782c7..faba77a09 100644
--- a/user/aspell-dict-tl/APKBUILD
+++ b/user/aspell-dict-tl/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tagalog-wordlist/aspell6-tl-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-tl-$_pkgver"
 
diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD
index 439954c7f..08a1f0a7b 100644
--- a/user/aspell-dict-tn/APKBUILD
+++ b/user/aspell-dict-tn/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell5-tn-$_pkgver"
 
diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD
index 4683cd993..47ee929d3 100644
--- a/user/aspell-dict-tr/APKBUILD
+++ b/user/aspell-dict-tr/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-tr-$_pkgver"
 
diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD
index f23364229..8633edd1e 100644
--- a/user/aspell-dict-uk/APKBUILD
+++ b/user/aspell-dict-uk/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-uk-$_pkgver"
 
diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD
index 28baeb118..4635e2fd7 100644
--- a/user/aspell-dict-uz/APKBUILD
+++ b/user/aspell-dict-uz/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-uz-$_pkgver"
 
diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD
index 7d767e987..0c5e5351d 100644
--- a/user/aspell-dict-vi/APKBUILD
+++ b/user/aspell-dict-vi/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-vi-$_pkgver"
 
diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD
index 4dd5b0a0d..bb1c65093 100644
--- a/user/aspell-dict-wa/APKBUILD
+++ b/user/aspell-dict-wa/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-wa-$_pkgver"
 
diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD
index 30a5c12b6..873ad8da9 100644
--- a/user/aspell-dict-yi/APKBUILD
+++ b/user/aspell-dict-yi/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell6-yi-$_pkgver"
 
diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD
index 1d9108516..500b6657c 100644
--- a/user/aspell-dict-zu/APKBUILD
+++ b/user/aspell-dict-zu/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends="aspell"
-makedepends="debianutils-which"
+makedepends="cmd:which"
 source="https://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$_pkgver.tar.bz2"
 builddir="$srcdir/aspell-zu-$_pkgver"
 
diff --git a/user/kpartx/APKBUILD b/user/kpartx/APKBUILD
index e5d464f77..3525feddf 100644
--- a/user/kpartx/APKBUILD
+++ b/user/kpartx/APKBUILD
@@ -10,7 +10,7 @@ options="!check" # Requires root and loopback/dm-mod kernel modules.
 license="LGPL-2.0-only"
 depends=""
 makedepends="lvm2-dev"
-checkdepends="debianutils-which parted"
+checkdepends="cmd:which parted"
 subpackages="$pkgname-doc"
 source="multipath-tools-$pkgver.tar.gz::https://github.com/opensvc/multipath-tools/archive/refs/tags/$pkgver.tar.gz
 test-kpartx"