Fix makeinfo version check to work with texinfo-4.11 #195074.

Package-Manager: portage-2.1.3.12

4 files changed, 24 insertions, 21 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index 70ddd79f779c..02c1cb3c15b6 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.313 2007/10/07 01:59:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.314 2007/10/08 14:37:54 vapier Exp $
+
+  08 Oct 2007; Mike Frysinger <vapier@gentoo.org> binutils-2.18-r1.ebuild:
+  Fix makeinfo version check to work with texinfo-4.11 #195074.
 
   07 Oct 2007; Mike Frysinger <vapier@gentoo.org> binutils-2.17-r2.ebuild:
   Add support for DragonFly BSD #189079.
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index ae9397bb195d..fc51cff19f93 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -27,7 +27,7 @@ DIST binutils-2.17.50.0.17-patches-1.1.tar.bz2 7098 RMD160 0ffb6d28736eb30731092
 DIST binutils-2.17.50.0.17.tar.bz2 13999363 RMD160 b2152d9e4615baf48cd2738312acabda811fe644 SHA1 427d114a7722b4a21778a2f241b94e18320d93e6 SHA256 3ddcfb8a26e373360ea2098e386e2a16a228ffce5ff24d734f3c4555420eb506
 DIST binutils-2.17.tar.bz2 13795751 RMD160 3995d7ed97f115e76ce55b4c1f5256d53559c84f SHA1 a557686eef68362ea31a3aa41ce274e3eeae1ef0 SHA256 e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e
 DIST binutils-2.18-patches-1.2.tar.bz2 9913 RMD160 b9b4ea8f27032d324f3364655e9119c6da26c3e0 SHA1 16c629c5f84c73922513c52e2480f37dea7eb734 SHA256 6941bce5908292c0211a9ab8964d16f639dce5fdcb8cc5ae12b0e436c3af7429
-DIST binutils-2.18-patches-1.4.tar.bz2 16615 RMD160 45cbc9f318b2be8fb85c26f33d793513a230d936 SHA1 7fc92b36e365bae6fb5340b4f7378c124519cac6 SHA256 e73e92c10046cebf5192999f99fb699c37d7b34d5ff74563da8f7a9df79f6188
+DIST binutils-2.18-patches-1.5.tar.bz2 16956 RMD160 a3b61fdc02c8d7ce5974f1037eca41c623d9b386 SHA1 1523831be00f9b8aaae5cd701342953d9a0ba87e SHA256 b50f09b2d7ee5bf349283f5267f445fdfac69b6fa293df80abe89c02c2b2b417
 DIST binutils-2.18.50.0.1-patches-1.0.tar.bz2 9232 RMD160 dc061f1336faf1f2ab7666044764a7fc572ad3ba SHA1 14182402f3464ca2da47334ac628d9551f5d51d9 SHA256 bfcf67593615f9650d7394878ed551f1a46ec0f435d41110139814d97604aab7
 DIST binutils-2.18.50.0.1.tar.bz2 13975177 RMD160 9ff1e7399a41503573e067c1af0808f0bcd530e6 SHA1 4e28e9b2ab5f37162569a60a8a88db29bacf28fe SHA256 7a270ff69892824ac5e4a04bd5dd8f105019194ef1c42eae1f98f1f214f37a60
 DIST binutils-2.18.50.0.2-patches-1.0.tar.bz2 9046 RMD160 9a2838fc680b95ac4a15f54cfe983e5dbad0ee7e SHA1 caf8dd5047a101eef11516ee24bd0c711afec9da SHA256 db55723b84b4f4448bae01f3b7660392a1850a9a63f326702c4fe8e0d70f05d0
@@ -69,10 +69,10 @@ EBUILD binutils-2.17.ebuild 434 RMD160 1fe89662acd6c3c31d9fb35eaa16afacb931716a
 MD5 a3e3506f5fa0b2c7f9975d12559cb981 binutils-2.17.ebuild 434
 RMD160 1fe89662acd6c3c31d9fb35eaa16afacb931716a binutils-2.17.ebuild 434
 SHA256 c98f555f42bd21074e0b03e2e64744b74bfc4771c7971bdea4b9005094a8640e binutils-2.17.ebuild 434
-EBUILD binutils-2.18-r1.ebuild 484 RMD160 50e2f2c66f8f08634cb5101c2cc6faa7d1392d4a SHA1 c8844fcc6f71b646673d80b46fa821e6bf13546e SHA256 f89a8e745efb716c68bd9cadccabe630bf4bae3a20ad4a3db3412b0a8b8c37c0
-MD5 7339e6a7b71b94e2a075988946828d3f binutils-2.18-r1.ebuild 484
-RMD160 50e2f2c66f8f08634cb5101c2cc6faa7d1392d4a binutils-2.18-r1.ebuild 484
-SHA256 f89a8e745efb716c68bd9cadccabe630bf4bae3a20ad4a3db3412b0a8b8c37c0 binutils-2.18-r1.ebuild 484
+EBUILD binutils-2.18-r1.ebuild 484 RMD160 98a139f47b318a948109e3460c471659980b1b0a SHA1 5b4978821b5d3ec9bcaa3f1c202e13fc925bb4b4 SHA256 f376f427b481f12d5c77c2c11056bf2a195bd1bfe1f32dd4350ef21f715ea1b1
+MD5 172c47caaf5f2756bf45adb03fedff22 binutils-2.18-r1.ebuild 484
+RMD160 98a139f47b318a948109e3460c471659980b1b0a binutils-2.18-r1.ebuild 484
+SHA256 f376f427b481f12d5c77c2c11056bf2a195bd1bfe1f32dd4350ef21f715ea1b1 binutils-2.18-r1.ebuild 484
 EBUILD binutils-2.18.50.0.1.ebuild 299 RMD160 c5ce3520191b1e35e8335da9a31a62feb3741d58 SHA1 8a033a221b5c9e049be36719e0a5767c606814b7 SHA256 3bfcb6a1d08466ca4968385d04bb66dcdda38acd29c8959e95f0f5b1ec303a97
 MD5 7410d1dc176826da9a4f1cad5ef92d27 binutils-2.18.50.0.1.ebuild 299
 RMD160 c5ce3520191b1e35e8335da9a31a62feb3741d58 binutils-2.18.50.0.1.ebuild 299
@@ -85,10 +85,10 @@ EBUILD binutils-2.18.ebuild 362 RMD160 581becd6b425234f9d476353e68226140c7aaba9
 MD5 c71d80257fed36bce6f5c64e59ee5154 binutils-2.18.ebuild 362
 RMD160 581becd6b425234f9d476353e68226140c7aaba9 binutils-2.18.ebuild 362
 SHA256 1858cab3c5bd9c7b8b2193b8806959a9ac9ac15714d7f3fa00e6c42b56402035 binutils-2.18.ebuild 362
-MISC ChangeLog 56489 RMD160 3c7aa2ab2ee14a4a1ad72977178cde0fe95bf51b SHA1 c4f17301e42f21d8637e4755d98d1b583aed3020 SHA256 d242ac1c9147bfb954b111f964c4ab8e8afd5075842578593d413755addbf523
-MD5 42bcea72986aec6ad8153cc9fb9e85e4 ChangeLog 56489
-RMD160 3c7aa2ab2ee14a4a1ad72977178cde0fe95bf51b ChangeLog 56489
-SHA256 d242ac1c9147bfb954b111f964c4ab8e8afd5075842578593d413755addbf523 ChangeLog 56489
+MISC ChangeLog 56629 RMD160 7a4c5b3c5dd3641b20a1c1ce5d421bf60af328b0 SHA1 e0e48ee255612e36ab5c056148b9731c197f0689 SHA256 50ccf9feea60c205681fd2670fb5141e9d82089140958afadd611ec72ea3824e
+MD5 4799b3209e7fe626ba6ba60667f3dbc2 ChangeLog 56629
+RMD160 7a4c5b3c5dd3641b20a1c1ce5d421bf60af328b0 ChangeLog 56629
+SHA256 50ccf9feea60c205681fd2670fb5141e9d82089140958afadd611ec72ea3824e ChangeLog 56629
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -123,9 +123,9 @@ SHA256 7549254b0fc97edc0691eb05bc629173a75aeab4213c972f5d7373de25330939 files/di
 MD5 27ccdbc539e77c1e83fcaf840c061950 files/digest-binutils-2.18 524
 RMD160 fd57cdaa42fb5b08a8bb566e2c94c46d779fb416 files/digest-binutils-2.18 524
 SHA256 23eab72dce2c6a9ac48b831288bf2fe7547332c23e108adfc24b2745795ddee1 files/digest-binutils-2.18 524
-MD5 dba61132eaa5b39b6c0f3dcdfee93f89 files/digest-binutils-2.18-r1 527
-RMD160 e6cd3e4bcb5aa585290d1b09b5f65fc86f84941c files/digest-binutils-2.18-r1 527
-SHA256 7664a3affe11b5a48485d5291e61af3cf5057be784d2d61bfe7ebbfa4219c6db files/digest-binutils-2.18-r1 527
+MD5 8d6b2ac7139d87b75c61220847968886 files/digest-binutils-2.18-r1 527
+RMD160 ce76042e9b1335f7cea3fc268b5f4a0777f528db files/digest-binutils-2.18-r1 527
+SHA256 caa7c972b8cc2eef2a1638a1dc07110b8779b6f5e8e77f2e04a12344ee3052fe files/digest-binutils-2.18-r1 527
 MD5 439cc4492a597c1be5e2af3e15bb91b1 files/digest-binutils-2.18.50.0.1 566
 RMD160 2f7d7c5f3dff5a492617f665c67c58f310a7c95a files/digest-binutils-2.18.50.0.1 566
 SHA256 4b02d34e0c33c43320cdef1fc49e1c541d60ca1f5e1dcf6462e0cf2026efb747 files/digest-binutils-2.18.50.0.1 566
@@ -135,7 +135,7 @@ SHA256 b25b9e41a2061b3fd9b316c80b5b8bf5a1598b42227d647430475adbfb4237df files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCD2dp/wUKkr7RBoRAlvLAJoDFxMqxY/Ynbil/WuPgNzYlDhOcACbBrH3
-p5BrXuRXeWeUydx3w4rcc0g=
-=F7UM
+iD8DBQFHCkDIp/wUKkr7RBoRApRnAJ9nFLVdJacMSBzRLPL82LAVPBSLYgCfUMwI
+mt0t48+qz8sJCwsNuXWRlYM=
+=rJeX
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils/binutils-2.18-r1.ebuild b/sys-devel/binutils/binutils-2.18-r1.ebuild
index a18a5720647c..8fa9d529f970 100644
--- a/sys-devel/binutils/binutils-2.18-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.18-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.18-r1.ebuild,v 1.3 2007/10/06 23:17:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.18-r1.ebuild,v 1.4 2007/10/08 14:37:54 vapier Exp $
 
-PATCHVER="1.4"
+PATCHVER="1.5"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
diff --git a/sys-devel/binutils/files/digest-binutils-2.18-r1 b/sys-devel/binutils/files/digest-binutils-2.18-r1
index ea303b591ef6..d3066fa60f22 100644
--- a/sys-devel/binutils/files/digest-binutils-2.18-r1
+++ b/sys-devel/binutils/files/digest-binutils-2.18-r1
@@ -1,6 +1,6 @@
-MD5 d8829fc23ccc710f247313176135b229 binutils-2.18-patches-1.4.tar.bz2 16615
-RMD160 45cbc9f318b2be8fb85c26f33d793513a230d936 binutils-2.18-patches-1.4.tar.bz2 16615
-SHA256 e73e92c10046cebf5192999f99fb699c37d7b34d5ff74563da8f7a9df79f6188 binutils-2.18-patches-1.4.tar.bz2 16615
+MD5 4a0f06bbe7b2a8b631e1b1764e896984 binutils-2.18-patches-1.5.tar.bz2 16956
+RMD160 a3b61fdc02c8d7ce5974f1037eca41c623d9b386 binutils-2.18-patches-1.5.tar.bz2 16956
+SHA256 b50f09b2d7ee5bf349283f5267f445fdfac69b6fa293df80abe89c02c2b2b417 binutils-2.18-patches-1.5.tar.bz2 16956
 MD5 9d22ee4dafa3a194457caf4706f9cf01 binutils-2.18.tar.bz2 14962245
 RMD160 78d07475667c55ecbf9068dbb90362a3445b2a99 binutils-2.18.tar.bz2 14962245
 SHA256 487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b binutils-2.18.tar.bz2 14962245