[gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/

["Sam James" <sam@gentoo.org>]

commit:     2af83a21b451b1738fdb04d7216312af4a078efe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 22:03:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 22:22:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af83a21

sys-fs/lvm2: fix autoconf-2.72 compat

Revbump as @EGREP@ isn't substituted without it but it installs "successfully".

Closes: https://bugs.gentoo.org/920798
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/lvm2-2.03.22-autoconf-2.72-egrep.patch   | 30 ++++++++++++++++++++++
 ...m2-2.03.22-r2.ebuild => lvm2-2.03.22-r3.ebuild} |  1 +
 2 files changed, 31 insertions(+)

diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-autoconf-2.72-egrep.patch b/sys-fs/lvm2/files/lvm2-2.03.22-autoconf-2.72-egrep.patch
new file mode 100644
index 000000000000..9ce7d540200e
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.22-autoconf-2.72-egrep.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/920798
+https://gitlab.com/lvmteam/lvm2/-/merge_requests/4
+
+From 39cb34e56b8c04b4d652eb9dbd643e10a05ff21c Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Mon, 6 Nov 2023 16:44:41 +0800
+Subject: [PATCH] configure.ac: check egrep
+
+The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
+from configure.ac, then it fails to substitute '@EGREP@':
+
+|     [GEN] command-lines-input.h
+| /bin/bash: line 2: @EGREP@: command not found
+|     [GEN] command-count.h
+
+Call AC_PROG_EGREP to fix the error.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,6 +78,7 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_MKDIR_P
+ AC_PROG_RANLIB
++AC_PROG_EGREP
+ AC_CHECK_TOOL([READELF], [readelf])
+ AC_CHECK_TOOL(AR, ar)
+ AC_PATH_TOOL(CFLOW_CMD, cflow)
+-- 
+GitLab

diff --git a/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r3.ebuild
similarity index 99%
rename from sys-fs/lvm2/lvm2-2.03.22-r2.ebuild
rename to sys-fs/lvm2/lvm2-2.03.22-r3.ebuild
index a53c83765217..68e624c6d31d 100644
--- a/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.22-r3.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
 	# For upstream -- review and forward:
 	"${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
 	"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
+	"${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch
 )
 
 pkg_setup() {