use $EGREP, not grep #77745

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index dda14ba87ef336114d54c840afc62dccb1f48bd8..ee33ff66f71ea4d1764949f8ee43edda4c53038e 100644 (file)
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -25,13 +25,13 @@ MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cx
 MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
 MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
 MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
+MD5 346df8edf0af3e539da4b57957fffe21 files/1.4.3/libtool-1.4.2-portage.patch 2315
 MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
 MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
 MD5 94591cd9fb847704a323c0faf31fdbf2 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
 MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
 MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
 MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
-MD5 73a7adc6c9b86c77affeeebccad0eedf files/1.4.3/libtool-1.4.2-portage.patch 2307
 MD5 e9bbbf33e0ca9ed566c2bf5209265cfe files/1.5.6/libtool-1.5-filter-host-tags.patch 785
 MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
 MD5 ec9cd0c9953bac111564122a5c209278 files/1.5.2/libtool-1.5-filter-host-tags.patch 1846
@@ -40,9 +40,9 @@ MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6
 MD5 8ac4aa8ff1c680fe44447274d9f3a673 files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 882
 MD5 b81a86ce5e9014e53bd7beb12e46ed12 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1155
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB2NzsroRuSHgZdywRAiOpAJ4nfEFq28E2FGTWmoh0PrfYeo0fFQCcDeyh
-0N7nNyl4P3mxVKYQD0Nc7Bc=
-=VGv7
+iD8DBQFB5b5NroRuSHgZdywRAuK5AJ9Gjjx8GpziutL1ocUOD8bFwkqZ+QCeJZdD
+00mkFNz9OqAl3WhIr9N3H7s=
+=V84y
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
index 290d040f67804e17be527672d9935e65c2ad2fd9..2da7b12c233294335e1ccb465439acf159307f66 100644 (file)
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
@@ -14,7 +14,7 @@
 +              fi
 +              # Do not add duplicates
 +              if test "$mynewdependency_lib"; then
-+                if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++                if test -z "`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`"; then
 +                  newdependency_libs="$newdependency_libs $mynewdependency_lib"
 +                fi
 +              fi
@@ -27,10 +27,10 @@
 +                  S="$PWORKDIR"
 +                fi
 +                # We do not want portage's build root ($S) present.
-+                if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
++                if test -n "`echo $deplib |$EGREP -e "$S"`" && test "$S"; then
 +                  mynewdependency_lib=""
 +                # We do not want portage's install root ($D) present.
-+                elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
++                elif test -n "`echo $deplib |$EGREP -e "$D"`" && test "$D"; then
 +                  eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
 +                else
 +                  mynewdependency_lib="$deplib"
@@ -40,7 +40,7 @@
 +              fi
 +              # Do not add duplicates
 +              if test "$mynewdependency_lib"; then
-+                if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++                if test -z "`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`"; then
 +                      newdependency_libs="$newdependency_libs $mynewdependency_lib"
 +                fi
 +              fi