gentoo auto-resync : 06:05:2024 - 00:00:51

2 files changed, 187 insertions, 1 deletions

diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index bb49108b9171..9034a5f666d3 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -3,7 +3,7 @@ AUX autogen-5.18.16-configure-c99.patch 1380 BLAKE2B ec007ffc3052d156e2dfa671cec
 AUX autogen-5.18.16-guile-3.patch 1277 BLAKE2B 18aea6b2da8afc14c37ad6dc6b21eafcf76a93715c399a167237d653aa133879093c6b0c430f28941db8f2b5c5760b9c9586a19836e9692cd080afb9c4e0efac SHA512 a006bcd4dd496274894f7d57c8884171a370fb1fd59bf2e61478c5848b3f3a2dedcda2e01a3f70a4904036ee097d570491065d1f2bf18bcb2ce7525727e17689
 AUX autogen-5.18.16-make-4.3.patch 814 BLAKE2B 53c823c59d4c896881593190fa27242bc90cc47412ca79fa58a29ecebd6ba1f201aafca7262c7eec30749e684148ae845fb1db1f8687b15b9a332e12462a12a0 SHA512 27489e5fd3a9df979a43c479d30e8566e863cd70d20ebf5788582aeaf8144912b7153f42f8df7156cd11b21ab849ff984f5042667500ee041af76de85a8eea3e
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
-AUX autogen-5.18.16-no-which.patch 418 BLAKE2B 395fb12e26d0bf5275e6f6f938a2cbd3c054a5377cd8cd7ce72c812f6feb5617d4106481d7b1b8085b88f0e3fb42bbdaa849364b3704a38d8718d380bd20344b SHA512 80a4a1b4a996ddc61b22e38ec371fe385a278199b8b191f5ee516efa093592c20782ccfe979d716d56583dd1eca287c9e4feecde844a9e7326f9e055e450887e
+AUX autogen-5.18.16-no-which.patch 6158 BLAKE2B 7a92cd282bade9b83c3e08af8c3ae3abdffa3532052e1f00ecb955a067a6a4586514cb5409f6fff364df64d816f8a6f0b624c6eac26e80324fc6ca9a0013df48 SHA512 2250b0f200cb23b4d11803d184321fc0959d0b5227f9bf3d405456c1a80fbb3fdbe46f075a2bcce70f9cc21f30074554cf1f36532ceb2832a47b891efeaf91a7
 AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
diff --git a/sys-devel/autogen/files/autogen-5.18.16-no-which.patch b/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
index c4b462cba420..ce53c271843e 100644
--- a/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
+++ b/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
@@ -1,3 +1,167 @@
+--- a/autoopts/mk-tpl-config.sh
++++ b/autoopts/mk-tpl-config.sh
+@@ -98,7 +98,7 @@ fix_scripts() {
+         st=`sed 1q $f`
+ 
+         case "$st" in
+-        *perl ) echo '#!' `which perl`
++        *perl ) echo '#!' `command -v perl`
+                  sed 1d $f
+                  ;;
+ 
+@@ -124,7 +124,7 @@ find_shell_prog() {
+     case `uname -s` in
+     SunOS )
+       while : ; do
+-        POSIX_SHELL=`which bash`
++        POSIX_SHELL=`command -v bash`
+         test -x "${POSIX_SHELL}" && break
+         POSIX_SHELL=/usr/xpg4/bin/sh
+         test -x "${POSIX_SHELL}" && break
+@@ -139,7 +139,7 @@ find_cat_prog() {
+     do
+         \unalias -a
+         unset -f command cat which
+-        POSIX_CAT=`which cat`
++        POSIX_CAT=`command -v cat`
+         test -x "$POSIX_CAT" && break
+         POSIX_CAT=`
+             PATH=\`command -p getconf CS_PATH\`
+--- a/autoopts/test/defs.in
++++ b/autoopts/test/defs.in
+@@ -40,7 +40,7 @@ cfg_vals()
+     if test "X$BASH_VERSION" = X
+     then
+       # On Solaris, make certain we do not use /bin/sh
+-      sh=`which bash`
++      sh=`command -v bash`
+       test "X$sh" = X && sh=/usr/xpg4/bin/sh
+       BASH_VERSION=not-good-enough
+       export BASH_VERSION
+--- a/autoopts/tpl/agtexi-cmd.tpl
++++ b/autoopts/tpl/agtexi-cmd.tpl
+@@ -779,7 +779,7 @@ DEFINE initialization                   =][=
+ =][= # END-BUILDTREE-ISMS
+ 
+ (shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
+-       test -x \"${CLexe}\" || CLexe=`which columns`")
++       test -x \"${CLexe}\" || CLexe=`command -v columns`")
+ 
+ # END-INSTALL-ONLY-CODE =][=
+ 
+--- a/autoopts/tpl/cmd-doc.tlib
++++ b/autoopts/tpl/cmd-doc.tlib
+@@ -42,7 +42,7 @@
+ :+][+: # END-BUILDTREE-ISMS
+ 
+ (shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
+-       test -x \"${CLexe}\" || CLexe=`which columns`")
++       test -x \"${CLexe}\" || CLexe=`command -v columns`")
+ 
+ # END-INSTALL-ONLY-CODE :+][+:
+ 
+--- a/autoopts/tpl/def2pot.tpl
++++ b/autoopts/tpl/def2pot.tpl
+@@ -68,7 +68,7 @@ ENDDEF                                                       =][=
+ =][= # END-BUILDTREE-ISMS
+ 
+ (shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
+-       test -x \"${CLexe}\" || CLexe=`which columns`")
++       test -x \"${CLexe}\" || CLexe=`command -v columns`")
+ 
+ # END-INSTALL-ONLY-CODE =][= #
+ 
+--- a/autoopts/tpl/getopt.tpl
++++ b/autoopts/tpl/getopt.tpl
+@@ -81,7 +81,7 @@ CASE (suffix) +][+
+ # END-BUILDTREE-ISMS the following code is for installed version:
+     agopts=
+     aocfg=`echo ${AGexe} | sed 's@/[^/]*$@@'`/autoopts-config
+-    test -x "${aocfg}" || aocfg=`which autoopts-config`
++    test -x "${aocfg}" || aocfg=`command -v autoopts-config`
+     tarfile=`${aocfg} libsrc`
+ 
+ # END-INSTALL-ONLY-CODE +]
+--- a/autoopts/tpl/options.tpl
++++ b/autoopts/tpl/options.tpl
+@@ -39,7 +39,7 @@ c
+ =][= # END-BUILDTREE-ISMS
+ 
+ (shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
+-       test -x \"${CLexe}\" || CLexe=`which columns`")
++       test -x \"${CLexe}\" || CLexe=`command -v columns`")
+ 
+ # END-INSTALL-ONLY-CODE     =][=
+ 
+--- a/autoopts/tpl/usage.tlib
++++ b/autoopts/tpl/usage.tlib
+@@ -34,7 +34,7 @@
+ =][= # END-BUILDTREE-ISMS
+ 
+ (shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
+-       test -x \"${CLexe}\" || CLexe=`which columns`")
++       test -x \"${CLexe}\" || CLexe=`command -v columns`")
+ 
+ # END-INSTALL-ONLY-CODE =][=
+ 
+--- a/config/ag_macros.m4
++++ b/config/ag_macros.m4
+@@ -505,7 +505,7 @@ AC_DEFUN([AG_ENABLE_DEBUG],[
+         [Define this if wanting autogen debugging])
+     AC_DEFINE([DEBUG_ENABLED], [1],
+           [Define this if debugging is enabled])
+-    [f=`which dmalloc 2>/dev/null`
++    [f=`command -v dmalloc 2>/dev/null`
+     test -n "$f" && LIBS="${LIBS} -ldmalloc"]
+   fi
+ 
+--- a/config/bootstrap.shlib
++++ b/config/bootstrap.shlib
+@@ -47,16 +47,16 @@ case "${SHELL}" in
+ *[akz]sh) : ;;
+ *)
+   while : ; do
+-    SHELL=`which bash 2>/dev/null`
++    SHELL=`command -v bash 2>/dev/null`
+     test -x "${SHELL}" && break
+ 
+-    SHELL=`which ksh 2>/dev/null`
++    SHELL=`command -v ksh 2>/dev/null`
+     test -x "${SHELL}" && break
+ 
+     SHELL=/usr/xpg4/bin/sh
+     test -x "${SHELL}" && break
+ 
+-    SHELL=`which sh 2>/dev/null`
++    SHELL=`command -v sh 2>/dev/null`
+     test -x "${SHELL}" && break
+ 
+     die "unable to determine which shell to use"
+--- a/config/libopts.m4
++++ b/config/libopts.m4
+@@ -108,9 +108,9 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
+   [while :
+   do
+       test -x "$POSIX_SHELL" && break
+-      POSIX_SHELL=`which bash`
++      POSIX_SHELL=`command -v bash`
+       test -x "$POSIX_SHELL" && break
+-      POSIX_SHELL=`which dash`
++      POSIX_SHELL=`command -v dash`
+       test -x "$POSIX_SHELL" && break
+       POSIX_SHELL=/usr/xpg4/bin/sh
+       test -x "$POSIX_SHELL" && break
+--- a/config/mk-shdefs.in
++++ b/config/mk-shdefs.in
+@@ -109,7 +109,7 @@ configure() {
+     {
+         cmd='`set -o | '${AWK}" '/^allexport/ {print \$2}'"\`
+         cat <<- _EOF_
+-		#! `which echo` this-file-should-be-sourced,-not-executed
++		#! `command -v echo` this-file-should-be-sourced,-not-executed
+ 		# -*- Mode: shell-script -*-
+ 
+ 		case "$cmd" in
 --- a/configure.ac
 +++ b/configure.ac
 @@ -149,9 +149,9 @@ GDnam=getdefs${ac_exeext}
@@ -13,3 +177,25 @@
  else
    AGexe=${ag_top_builddir}/agen5/${AGnam}
    GDexe=${ag_top_builddir}/getdefs/${GDnam}
+--- a/doc/mk-agen-texi.sh
++++ b/doc/mk-agen-texi.sh
+@@ -65,7 +65,7 @@ set_config_values()
+   nl='
+ ' ht='	'
+   . ${top_builddir}/config/shdefs
+-  : ${MAKE=`which make`}
++  : ${MAKE=`command -v make`}
+   : ${srcdir=`pwd`}
+   srcdir=`cd ${srcdir} >/dev/null ; pwd`
+   INCLUDES="${DEFS} "`
+--- a/getdefs/test/defs
++++ b/getdefs/test/defs
+@@ -40,7 +40,7 @@ cfg_vals()
+     if test "X$BASH_VERSION" = X
+     then
+       # On Solaris, make certain we do not use /bin/sh
+-      sh=`which bash`
++      sh=`command -v bash`
+       test "X$sh" = X && sh=/usr/xpg4/bin/sh
+       BASH_VERSION=not-good-enough
+       export BASH_VERSION