fix patches so they past libtool tests

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index a5f7343ff7e2dfcc0276042f62a5890c25b016e7..29bf26124079a6505b0634d7432f4c5314b9d8cb 100644 (file)
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b6d71fc4d80b025a7a79a4cc23d83b0f ChangeLog 10322
 MD5 be643832e70bcfb979eee96d00ae7f57 libtool-1.5.10.ebuild 4660
 MD5 8fbefdb6af5cab0e9ec3ec281b8b71a7 libtool-1.5.2-r5.ebuild 5890
@@ -56,17 +53,10 @@ MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags
 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 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
-MD5 7dea4af56c6c797e220a8df53cf132d8 files/1.5.6/libtool-1.5-filter-host-tags.patch 771
+MD5 e9bbbf33e0ca9ed566c2bf5209265cfe files/1.5.6/libtool-1.5-filter-host-tags.patch 785
 MD5 d5d5e0c05015661718dd3015531342c5 files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch 897
 MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
 MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
 MD5 8ac4aa8ff1c680fe44447274d9f3a673 files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 882
 MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153
-MD5 25baae722fe5fa86c1db6b5b5aa9eb79 files/1.5.2/libtool-1.5-filter-host-tags.patch 1826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBkTeXHTu7gpaalycRAs1dAKDUoFfJcdC/EcoSbO02Mizryj6BUACfSU0U
-kd0+FBny79PktzgQ8NXf5vc=
-=F6VH
------END PGP SIGNATURE-----
+MD5 ec9cd0c9953bac111564122a5c209278 files/1.5.2/libtool-1.5-filter-host-tags.patch 1846

diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch
index 30bfbd5d58d1d32b736d12702dfecf862fcb6136..26cd0a9534446635bcbf3f5b4d3a31f24ab7202d 100644 (file)
--- a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch
+++ b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch
@@ -1,6 +1,6 @@
 --- libtool-1.5.2/ltmain.in.orig       2004-11-04 04:20:50.608823576 +0000
 +++ libtool-1.5.2/ltmain.in    2004-11-04 04:23:25.151329544 +0000
-@@ -560,8 +560,12 @@
+@@ -560,8 +560,14 @@
          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
            # Evaluate the configuration.
            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
@@ -8,13 +8,15 @@
 +          trimedcc="${CC/${host}-}"
            case "$base_compile " in
 -          "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-+          "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;;
++          "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
++          tagname=CC
++          break ;;
 +          "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\
 +          "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.
              # Assume this is the tagged configuration we want.
-@@ -947,8 +950,12 @@
+@@ -947,8 +950,14 @@
          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
            # Evaluate the configuration.
            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
@@ -22,7 +24,9 @@
 +          trimedcc="${CC/${host}-}"
            case $base_compile in
 -          "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-+          "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;;
++          "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
++          tagname=CC
++          break ;;
 +          "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\
 +          "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*)
              # The compiler in $compile_command matches

diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
index ccaa25f7264ce214de9d8ccafa17de4aa10b65a4..d6b8cd0016af29b0cff86f30da27cb02363302d1 100644 (file)
--- a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
+++ b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
@@ -1,13 +1,15 @@
 --- libtool-1.5.10/ltmain.in.orig      2004-11-09 13:43:24.290875562 -0500
 +++ libtool-1.5.10/ltmain.in   2004-11-09 13:45:51.250048464 -0500
-@@ -242,7 +242,11 @@
+@@ -242,7 +242,13 @@
            esac
            CC_quoted="$CC_quoted $arg"
          done
 +          # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
 +          trimedcc="${CC/${host}-}"
            case "$@ " in
-+            "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;;
++            "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
++            tagname=CC
++            break ;;
 +            "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
              " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
              # The compiler in the base compile command matches