Merge branch 'which-provides' into 'master'

Fix cmd:which

Adding GNU which broke autoselection when `cmd:which` was used in APKBUILDs.
Fix by correcting the `provider_priority` typo in `system/debianutils`, add one
to `user/which`, and fix all of the recently added packages to use `cmd:which`
instead of a specific one.

In order for this to work correctly, the old versions of `debianutils-which`
and `which` may need to be purged from the mirrors.

See merge request !65

8 files changed, 9 insertions, 8 deletions

diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD
index fbcdfe041..8e79a7eef 100644
--- a/system/debianutils/APKBUILD
+++ b/system/debianutils/APKBUILD
@@ -32,7 +32,7 @@ package() {
 }
 
 which() {
-	provides_priority="10"
+	provider_priority=10
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/which "$subpkgdir"/usr/bin/
 	# This will emit a warning about docs on abuild, but this is expected.
diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD
index dd03d34e2..dc049071d 100644
--- a/user/fuse3/APKBUILD
+++ b/user/fuse3/APKBUILD
@@ -12,7 +12,7 @@ license="GPL-2.0-only AND LGPL-2.1-only AND BSD-2-Clause"
 depends="fuse-common"
 makedepends="linux-headers meson eudev-dev python3 py3-six py3-pluggy
 	py3-attrs py3-py"
-#checkdepends="py3-pytest debianutils-which"
+#checkdepends="py3-pytest cmd:which"
 subpackages="$pkgname-dev $pkgname-doc
 	$_pkgname-common:common:noarch $_pkgname-openrc:openrc:noarch"
 source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz
diff --git a/user/lsof/APKBUILD b/user/lsof/APKBUILD
index 32fff3e16..a7e0c4768 100644
--- a/user/lsof/APKBUILD
+++ b/user/lsof/APKBUILD
@@ -8,7 +8,7 @@ url="https://people.freebsd.org/~abe"
 arch="all"
 license="zlib-acknowledgement"
 subpackages="$pkgname-doc"
-makedepends="linux-headers debianutils-which utmps-dev"
+makedepends="linux-headers cmd:which utmps-dev"
 source="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${pkgname}_${pkgver}.tar.gz
 	utmps.patch
 	test-enable-suite.patch
diff --git a/user/shunit2/APKBUILD b/user/shunit2/APKBUILD
index 8a110ff6d..baa658cf8 100644
--- a/user/shunit2/APKBUILD
+++ b/user/shunit2/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 license="Apache-2.0"
 depends="/bin/sh"
 makedepends=""
-checkdepends="debianutils-which bash dash zsh"
+checkdepends="cmd:which bash dash zsh"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/kward/shunit2/archive/v$pkgver.tar.gz
 	dash-negative-lineno.patch"
diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD
index 404c077be..32fcfbd7c 100644
--- a/user/sshfs/APKBUILD
+++ b/user/sshfs/APKBUILD
@@ -10,7 +10,7 @@ options="!check"  # Requires fuse kernel module to be loaded and local ssh serve
 license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1-only"
 depends="openssh-client"
 makedepends="fuse3-dev glib-dev meson coreutils py3-docutils"
-#checkdepends="py3-pytest debianutils-which"
+#checkdepends="py3-pytest cmd:which"
 subpackages="$pkgname-doc"
 source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
 
diff --git a/user/which/APKBUILD b/user/which/APKBUILD
index 42e7e3b10..cea55c32a 100644
--- a/user/which/APKBUILD
+++ b/user/which/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=which
 pkgver=2.21
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility to show the full path of commands"
 url="http://savannah.gnu.org/projects/which"
 arch="all"
@@ -10,6 +10,7 @@ license="GPL-2.0+ AND LGPL-2.0+ AND GPL-3.0+"
 makedepends=""
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+provider_priority=1
 
 build() {
 	cd "$builddir"
diff --git a/user/xdotool/APKBUILD b/user/xdotool/APKBUILD
index 35d7984cc..3aae63783 100644
--- a/user/xdotool/APKBUILD
+++ b/user/xdotool/APKBUILD
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 depends=""
 depends_dev="libx11-dev libxtst-dev libxinerama-dev libxkbcommon-dev"
 makedepends="$depends_dev perl"
-#checkdepends="xvfb ruby-minitest debianutils-which lsof xdpyinfo xterm xwininfo"
+#checkdepends="xvfb ruby-minitest cmd:which lsof xdpyinfo xterm xwininfo"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/jordansissel/xdotool/releases/download/v$pkgver/xdotool-$pkgver.tar.gz"
 
diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD
index 8719fc556..f30ebb39a 100644
--- a/user/xfce4-panel-profiles/APKBUILD
+++ b/user/xfce4-panel-profiles/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
 options="!check" # no tests
 license="GPL-3.0+"
 depends="python3"
-makedepends="intltool which"
+makedepends="intltool cmd:which"
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-$pkgver.tar.bz2"
 sha512sums="2d7980a79250414cc4611ccf573c2a3ee5eb510cf3ef6c32035ba23197eee1fded2e158cb50714dd935070916b07b3f33db02570f3d46a598144b4a2d3979ff4  xfce4-panel-profiles-1.0.8.tar.bz2"