gentoo resync : 29.12.2022

3 files changed, 34 insertions, 2 deletions

diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 9e8b90643447..b691c27c043f 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1,8 +1,9 @@
 AUX check-setuid.patch 839 BLAKE2B b0e360fa73174cc022891e7c4533d72c82ea9620a076054e51a5b885db65fb0aff540b88b10bef4e653942fca3e655b938623c68bd87a4d3dbc81fc9a3c447f8 SHA512 6c86673f33420ec672f7f74c1ff2423ebd43e6a6c9b54db7509196c66387c077bf105d76027a580f60f53f6dafc31c102364b4b6568e17ac5587a8833540315e
 AUX fix-aliasing.patch 1076 BLAKE2B ecd1b2ae5fc366342fdea7197eedcbcdbafa896304ed5018383f5776c8ca0ac93b11c45775b12e3fac2d9182c5758bc92cbd0f0022bb6370a4e7ed620e9d76c4 SHA512 edcc182ddc8a78c031111b301b090b9af97b0628dd6b53b353c144183d33f276d730596b0cd3947aba89bb1163135f990dada475b09a8f8ae8453e471671848f
 AUX implicit_pointer_conversion_fix_amd64.patch 307 BLAKE2B 39ea89191e3d4633ea4b77018fed933a31d698c91af10a4044e1090592f96803bfaff72006af70de6aa235ce419b3e63a319abc849efd0400d4285cbf9c47541 SHA512 1f036dde054ab641ea4af31d621eb6b6a41371749d9d54c70908981817f6c52c8b64d8b4967b525cdad2d62b78b81224187bbc8759ef3f5621ad3874a88079d9
+AUX no-which.patch 793 BLAKE2B 2821329dbb54625b2cce87f28d4dcc4677a61d85df6958f81167dd4d892e11964f1f7e2984a5f74f7343bb4991a4a4892546606b47d953c68aa4ec2c9695113e SHA512 5ae70b285ccd46c72f065df4c54be530a56c8743ea4e8c8a7eb2da2f3cc82575a2533ea1e7587fc2d10d61c8c5552a6d8a28184ecb15474d8a87e9af25440f32
 AUX no-xf86misc.patch 3220 BLAKE2B 1588866bdb372b5bfae031569a981e1fc0be716ec2b96cc46aa4118cd8db3e500760fb90a9394abbf792872d7cf65963daaf47c46a5db87249fd172370396711 SHA512 a27a7dff601c35ad5b41170be0aa3b2453c2b46c679f76ad4ae0b229731aa0d1e13e3c3dfeffbe690e119048a51c76ae091fa3673db8ceecb2f82f81d3857488
 AUX tidy-printf.patch 801 BLAKE2B 3015b266465ac1da7127cbc2c871daa729c22ce97c8bf9e88dff5ec3228192bc81bbc0fc31239add4256b8a0d44a852eb543079fbdecb909db41ac57f43ec070 SHA512 253f731e5be75676ef56ab320ee52625bee17a0a8f2bbb025efb8b9ac8a49da7330e5123bb0070eaa9c01f3cd66fadb85ead65c75c9412e6503744705402e9c4
 DIST alock-1.0.0.tar.gz 71497 BLAKE2B e61a5fd9fb9a5bcc23a535fcc81da7ae2006300c636a6103132125e0c84c18977690e0f44f489788bf8228f0af900638066ab8706ef731fdf32604dc013684e9 SHA512 7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5
-EBUILD alock-1.0.0-r1.ebuild 1632 BLAKE2B a14723ff008e1898c6e233f01868b08a40af50d5124a46ddfcf907f9a48a07e9a0f034866f3b82f17981b5880b069eeab4424e977d37999074dda85559dd20e6 SHA512 6122502715d9a16da4e771f3d8bebf53f9ab1bdbadf76db284b3968c92be09d98cbe1a11bb3393476f6e3a6a96d8171b335197820646446fb2fdb2dc168a43bc
+EBUILD alock-1.0.0-r1.ebuild 1662 BLAKE2B 8f5f1a6963452bcc4fea0f5f106e9a58f424d8758f3cf199f5cb74305c197495f4bfb763a0326ba456ceabde055696880d05cca69c7d081b50d44129ac7f3acc SHA512 e1e55fc13a03edfc8ea85df54b19f433db206704d9dc2ac4ca947432d68455d1836b12b49654d7986b6b3b039f6d77ba99968f177fbe847db707530023c37764
 MISC metadata.xml 603 BLAKE2B 7dfbc13207dc75cfc48b6344f9b8e3c1f2d68f9417522ae679392e1240153d4f2947fb68c5ba6029e0311c34d566779b6f28a13d4b569e7b1b1b052a22b0a6c0 SHA512 487f65c84c0e98140228380263f0dc25ad6fa947aa45b4c447b88a9a8e1257fddc32a7dd9c8e4db2d40c47d3f26d83c1ccaecc5b9561731178619a404bf38f96
diff --git a/x11-misc/alock/alock-1.0.0-r1.ebuild b/x11-misc/alock/alock-1.0.0-r1.ebuild
index 33a86aadaf0a..476253fafdaa 100644
--- a/x11-misc/alock/alock-1.0.0-r1.ebuild
+++ b/x11-misc/alock/alock-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/tidy-printf.patch
 	"${FILESDIR}"/fix-aliasing.patch
 	"${FILESDIR}"/no-xf86misc.patch
+	"${FILESDIR}"/no-which.patch
 )
 
 src_configure() {
diff --git a/x11-misc/alock/files/no-which.patch b/x11-misc/alock/files/no-which.patch
new file mode 100644
index 000000000000..1764be32c82d
--- /dev/null
+++ b/x11-misc/alock/files/no-which.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/844886
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@ msg_chkfor() {
+ check_docs() {
+ 
+     msg_chkfor "asciidoc"
+-    if which asciidoc 1> /dev/null 2>&3
++    if command -v asciidoc 1> /dev/null 2>&3
+     then
+         echo "ok."
+         echo "#_______________________" >&4
+@@ -40,7 +40,7 @@ check_docs() {
+ check_tools() {
+ 
+     msg_chkfor "compiler $CC"
+-    if which "$CC" 1> /dev/null 2>&3
++    if command -v "$CC" 1> /dev/null 2>&3
+     then
+         echo "ok."
+         echo "---------------------------------" 1>&3
+@@ -56,7 +56,7 @@ check_tools() {
+ check_imlib2() {
+ 
+     msg_chkfor "imlib2-config"
+-    if which imlib2-config 1> /dev/null 2>&3
++    if command -v imlib2-config 1> /dev/null 2>&3
+     then
+         echo "ok."
+         cat << EOF > tmp.c