[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

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

commit:     fefbb1236959fa6ea619899f7d42c694bdc3e3bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 15:07:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 15:08:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefbb123

sys-devel/libtool: fix tests w/ grep-3.8

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

 .../libtool/files/libtool-2.4.7-grep-3.8.patch     | 31 ++++++++++++++++++++++
 sys-devel/libtool/libtool-2.4.7-r1.ebuild          |  4 ++-
 sys-devel/libtool/libtool-9999.ebuild              |  6 +++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch b/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch
new file mode 100644
index 000000000000..8f1de478aece
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/892635
+https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00004.html
+
+From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
+Date: Wed, 21 Dec 2022 13:14:03 +0100
+Subject: [PATCH] tests: Fix grep warning about stray \ before /
+
+Recent version of grep emit a warning if stray \ is found before /.
+This leads to the link-order test failure.
+
+ * tests/link-order.at: Remove unneeded \ before /
+--- a/tests/link-order.at
++++ b/tests/link-order.at
+@@ -99,12 +99,12 @@ aix* | interix*) ;;  # These systems have different path syntax
+   case $hardcode_direct$hardcode_direct_absolute in
+   yesno)
+     AT_CHECK([if $EGREP relinking stderr; then
+-         $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout
++         $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout
+        else :; fi], [0], [ignore], [], [echo "wrong link order"])
+     ;;
+   *)
+     AT_CHECK([if $EGREP relinking stderr; then
+-         $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout
++         $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout
+        else :; fi], [0], [ignore], [], [echo "wrong link order"])
+     ;;
+   esac
+-- 
+2.38.1

diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index 405ca5779a7a..f9db3294ea9e 100644
--- a/sys-devel/libtool/libtool-2.4.7-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -30,7 +30,8 @@ RDEPEND="
 	sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69:*
 	>=sys-devel/automake-1.13:*
-	>=dev-libs/libltdl-2.4.7"
+	>=dev-libs/libltdl-2.4.7
+"
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
@@ -44,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 	"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
+	"${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch
 )
 
 src_prepare() {

diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index ae3d351ad479..17e669733130 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,8 @@ RDEPEND="
 	sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69:*
 	>=sys-devel/automake-1.13:*
-	>=dev-libs/libltdl-2.4.7"
+	>=dev-libs/libltdl-2.4.7
+"
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
@@ -43,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-mint.patch
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+	"${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch
 )
 
 src_prepare() {