| 1 |
commit: fe668307e129013f764d655fb4c3416872970de4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 16 23:13:53 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 16 23:13:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe668307 |
| 7 |
|
| 8 |
x11-misc/alock: avoid using which in configure |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/844886 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-misc/alock/alock-1.0.0-r1.ebuild | 3 ++- |
| 14 |
x11-misc/alock/files/no-which.patch | 30 ++++++++++++++++++++++++++++++ |
| 15 |
2 files changed, 32 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/x11-misc/alock/alock-1.0.0-r1.ebuild b/x11-misc/alock/alock-1.0.0-r1.ebuild |
| 18 |
index 33a86aadaf0a..476253fafdaa 100644 |
| 19 |
--- a/x11-misc/alock/alock-1.0.0-r1.ebuild |
| 20 |
+++ b/x11-misc/alock/alock-1.0.0-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -33,6 +33,7 @@ PATCHES=( |
| 28 |
"${FILESDIR}"/tidy-printf.patch |
| 29 |
"${FILESDIR}"/fix-aliasing.patch |
| 30 |
"${FILESDIR}"/no-xf86misc.patch |
| 31 |
+ "${FILESDIR}"/no-which.patch |
| 32 |
) |
| 33 |
|
| 34 |
src_configure() { |
| 35 |
|
| 36 |
diff --git a/x11-misc/alock/files/no-which.patch b/x11-misc/alock/files/no-which.patch |
| 37 |
new file mode 100644 |
| 38 |
index 000000000000..1764be32c82d |
| 39 |
--- /dev/null |
| 40 |
+++ b/x11-misc/alock/files/no-which.patch |
| 41 |
@@ -0,0 +1,30 @@ |
| 42 |
+https://bugs.gentoo.org/844886 |
| 43 |
+--- a/configure |
| 44 |
++++ b/configure |
| 45 |
+@@ -26,7 +26,7 @@ msg_chkfor() { |
| 46 |
+ check_docs() { |
| 47 |
+ |
| 48 |
+ msg_chkfor "asciidoc" |
| 49 |
+- if which asciidoc 1> /dev/null 2>&3 |
| 50 |
++ if command -v asciidoc 1> /dev/null 2>&3 |
| 51 |
+ then |
| 52 |
+ echo "ok." |
| 53 |
+ echo "#_______________________" >&4 |
| 54 |
+@@ -40,7 +40,7 @@ check_docs() { |
| 55 |
+ check_tools() { |
| 56 |
+ |
| 57 |
+ msg_chkfor "compiler $CC" |
| 58 |
+- if which "$CC" 1> /dev/null 2>&3 |
| 59 |
++ if command -v "$CC" 1> /dev/null 2>&3 |
| 60 |
+ then |
| 61 |
+ echo "ok." |
| 62 |
+ echo "---------------------------------" 1>&3 |
| 63 |
+@@ -56,7 +56,7 @@ check_tools() { |
| 64 |
+ check_imlib2() { |
| 65 |
+ |
| 66 |
+ msg_chkfor "imlib2-config" |
| 67 |
+- if which imlib2-config 1> /dev/null 2>&3 |
| 68 |
++ if command -v imlib2-config 1> /dev/null 2>&3 |
| 69 |
+ then |
| 70 |
+ echo "ok." |
| 71 |
+ cat << EOF > tmp.c |
Archives