tweak patch slightly based upon input from upstream

Package-Manager: portage-2.0.53

3 files changed, 29 insertions, 29 deletions

diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index db265c447b85..fec3a01b0735 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a3e9a0aa09d957e2b33dff7ceb210d1c ChangeLog 3430
 MD5 0e31c1486a2559fd48120d5f263dbbec binutils-config-1.8-r6.ebuild 562
-MD5 ef63d7e1a955a5461bea2a9094a385c1 files/binutils-config-1.8 9796
+MD5 50a3907df4438951895236f201f27767 files/binutils-config-1.8 9886
 MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r6 0
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDgLdigIKl8Uu19MoRAoW5AJ9zwvPt7j5co+k4ojMjkWhXep6hzQCcCCHh
-KQJUgtb9a9v7Gmggio4gkdU=
-=atr+
------END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index c0f362da2991..74de0555070f 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,21 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 627e538293f951771c932cb693bc692c ChangeLog 16150
-MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
-MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
-MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
-MD5 c230b7f5bd8fc555c76e041bc3c47b02 libtool-1.5.20.ebuild 5104
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 86dd9bc18548613d5629e361b17fb257 libtool-1.5.20-r1.ebuild 5117
-MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
-MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20 67
-MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
-MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
-MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
-MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20-r1 67
-MD5 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
-MD5 c7faa473d0ebb7cddcae5fb6e76ed29d files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637
-MD5 ed908a69f44e42aa9dce9ffde8bbb41d files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185
-MD5 7ee59c3c6384fd26a9e93db41bc1c88b files/1.5.20/libtool-1.5.20-version-checking.patch 1864
 MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
 MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
 MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
@@ -34,5 +20,29 @@ MD5 4e8d48f4fc332eb1291a12356b1e2f13 files/1.5.14/libtool-1.5.14-egrep.patch 404
 MD5 807631adcb4daeff2315f390d95d262f files/1.5.14/libtool-1.5.14-ltmain_sh-max_cmd_len.patch 1093
 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 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
+MD5 c7faa473d0ebb7cddcae5fb6e76ed29d files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637
+MD5 ed908a69f44e42aa9dce9ffde8bbb41d files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185
+MD5 557042a1a427c432aae126f696bab5d5 files/1.5.20/libtool-1.5.20-version-checking.patch 1857
 MD5 eea7fbac7b23154feebdfb9ad0951569 files/1.5.6/libtool-1.5-filter-host-tags.patch 1426
 MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
+MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
+MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
+MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
+MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20 67
+MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20-r1 67
+MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
+MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
+MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
+MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
+MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
+MD5 86dd9bc18548613d5629e361b17fb257 libtool-1.5.20-r1.ebuild 5117
+MD5 c230b7f5bd8fc555c76e041bc3c47b02 libtool-1.5.20.ebuild 5104
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDnj0bgIKl8Uu19MoRAvOuAJ4v9Zp47R1Rvw8BYFI5nhJgoSkbegCfSOxI
+aqqHh/lD9DPPJuE/kpm3kk8=
+=/Wqs
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch
index 63b8ef5be631..8d6f4f38172a 100644
--- a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch
+++ b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch
@@ -38,7 +38,7 @@ http://bugs.gentoo.org/73140
 +])
 +fi
 +gentoo_lt_version="@_LT_VERSION@"
-+gentoo_ltmain_version=`grep '^@<:@ 	@:>@*VERSION=' $ltmain | sed -e 's|^@<:@ 	@:>@*VERSION=||'`
++gentoo_ltmain_version=`sed -n '/^[[ 	]]*VERSION=/{s/^[[ 	]]*VERSION=//;p;q;}' "$ltmain"`
 +if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
 +  AC_MSG_RESULT(no)
 +  AC_MSG_ERROR([