Fix GNU Info file, bug 249167.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686

5 files changed, 37 insertions, 14 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 5087654570e3..7b0f5637fcf6 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.167 2008/10/17 18:48:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.168 2008/11/28 22:37:38 ulm Exp $
+
+  28 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/gettext-0.17-gnuinfo.patch, gettext-0.17.ebuild:
+  Fix GNU Info file, bug 249167.
 
   17 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
   openmp USE-flag is global now
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index b8e3b4bed48b..3a21014a284f 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
 AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
 AUX gettext-0.15-expat-no-dlopen.patch 585 RMD160 7e41b0b5b1f9a8eb220a445fde835c3a7a3f3ade SHA1 941da91b9e83eb137a222546e9d83777926ed46f SHA256 dc5d9adff87b786ec753b1251c135355daeb185ab275ee40d165031e56c5f539
+AUX gettext-0.17-gnuinfo.patch 634 RMD160 09ee57c6b9426bf0781fcd424a00b0ad389b7d89 SHA1 b0ad8cfe31752db56d8eaa82f2c55e6a81994677 SHA256 f38fb566eb1398a46ed93994d6576cd98d025d02e2ecde1f778d26956fe098a1
 AUX gettext-0.17-open-args.patch 1015 RMD160 11e344dcfa926fefe8045a08e97933722f47da31 SHA1 357ebe671577c4a78b2abee5228866e01dd804f8 SHA256 6409b1adbddbdb96d682ddb973e54f37d5e253b5b226e74b50b8d0874b553638
 DIST gettext-0.16.1.tar.gz 8539634 RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 SHA1 8642f4346dfd6a18ecd883329e150bfe9e0886c3 SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
 DIST gettext-0.17.tar.gz 11640890 RMD160 36df9d4ad2848ec26729781e0d7e25b419e7d261 SHA1 c51803d9f745f6ace36bd09c0486d5735ce399cf SHA256 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
 EBUILD gettext-0.16.1-r1.ebuild 3223 RMD160 195f67381b0b0ecfa82dd167b7f5959834661804 SHA1 a6bd8330bb6ac55bbfa3299f7eb00cec05229cef SHA256 86f6086696d72b8e0d2774383f93647275e45c2af96d018336fa598c82931de8
-EBUILD gettext-0.17.ebuild 3623 RMD160 58fd224bbed36fe676281fac0e6c472a4a12fc08 SHA1 3962dbd080cff6edff1e3461214f78dd39ca81f3 SHA256 a980cb5833bd91dc6688ac1c570e6dffdf49d95f22c6a32218064999e5a3514b
-MISC ChangeLog 21326 RMD160 81fd78d2b132be4e241cb73f113ffa770b4ef585 SHA1 b27330e0076d9e69269fc63ecb16ac13a74dc027 SHA256 3c8c8dd108bb243877db1a791b8341d9bb8b381311f366ae679e1a982b16c081
+EBUILD gettext-0.17.ebuild 3667 RMD160 ea08619a1b926a7bedf36e19a6cef979805f6b68 SHA1 fa70e528b672fd5d7f81bca8af1ac5b17d7e4357 SHA256 d5235b2bbb1db38e045040bf3f9171188d4cf1dbe7d617d630f10019b5abc0c8
+MISC ChangeLog 21462 RMD160 294e867ed703a9e69e8f842fb5e3c4f466d22118 SHA1 34ad73313e2c42d725a0c3d0aa64f3ad338d9e68 SHA256 ee61920dc9d0b35f6531b4fb65ca602aafdc5cb0fa9a346875b023cc45cbbfc3
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkj43nAACgkQkKaRLQcq0GJOmQCePh+zqqPSzT+WE4rdlMDY9UsE
-36YAoJDVGUVW9mdLte9H06lNmqfhnZ6W
-=i8PN
+iEYEARECAAYFAkkwctgACgkQOeoy/oIi7uwsJgCfTGjVqxpsyLVTc5lxn4+TSS59
+fxkAn0+r6Wz1wrvieNXuQJwoEq7ABH23
+=G1VD
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
new file mode 100644
index 000000000000..243916636fbe
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
@@ -0,0 +1,16 @@
+Fix broken Info file produced by texinfo 4.11
+http://bugs.gentoo.org/249167
+
+--- gettext-0.17/gettext-tools/doc/gettext.info
++++ gettext-0.17/gettext-tools/doc/gettext.info
+@@ -1,7 +1,8 @@
++This is gettext.info, produced by makeinfo version 4.13 from
++gettext.texi.
++
+ INFO-DIR-SECTION GNU Gettext Utilities
+ START-INFO-DIR-ENTRY
+-This is gettext.info, produced by makeinfo version 4.11 from gettext.texi.
+-
+ * gettext: (gettext).                          GNU gettext utilities.
+ * autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
+ * envsubst: (gettext)envsubst Invocation.      Expand environment variables.
diff --git a/sys-devel/gettext/gettext-0.17.ebuild b/sys-devel/gettext/gettext-0.17.ebuild
index 3da6cb4f0973..a9e3ee975482 100644
--- a/sys-devel/gettext/gettext-0.17.ebuild
+++ b/sys-devel/gettext/gettext-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.13 2008/09/26 22:31:33 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.14 2008/11/28 22:37:38 ulm Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
@@ -30,6 +30,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch #85054
 	epatch "${FILESDIR}"/${PN}-0.15-expat-no-dlopen.patch #146211
 	epatch "${FILESDIR}"/${PN}-0.17-open-args.patch #232081
+	epatch "${FILESDIR}"/${P}-gnuinfo.patch #249167
 
 	# bundled libtool seems to be broken so skip certain rpath tests
 	# http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 2fe59f92bfbc..f63fe88fd14d 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -6,6 +6,7 @@ AUX 1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637 RMD160 f46d46cdd9e5
 AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326
 AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5ad64066c5f8a5b1416b36 SHA1 c5000fa6da0ffec1d7c48d871db94d8237c949ca SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d
 AUX 1.5.6/libtool-1.5-filter-host-tags.patch 1608 RMD160 af10d3d3459d07f77ccbdef6080e931e3387af38 SHA1 5d27c058f803cdc1953e82b71f747c2028b78ea0 SHA256 a50cba1c4b799717b21355cc908993c5cdf913b66881992b74b79001f8feb891
+AUX 2.2.6a/libtool-2.2.6a-gnuinfo.patch 1454 RMD160 1342700e864e985559dd55f9d49a7d81c9d2a5ee SHA1 9c5410b857551ec202159dd570ca8a81f40d507e SHA256 a06eee9bbbbb617c6b8014bb67ba1442b0b0a618079998d1f629a6043c97083a
 DIST libtool-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f
 DIST libtool-1.5.26.tar.gz 2961939 RMD160 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 SHA1 4c1738351736562a951a345e24f233d00953ec0a SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
 DIST libtool-2.2.4.tar.bz2 1919208 RMD160 3bafc6c02ee34bd80d3bd2c4164aa71a94347b14 SHA1 bc485fd07c8b12820234240e9ef41dba693af2b7 SHA256 c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc
@@ -13,14 +14,14 @@ DIST libtool-2.2.6a.tar.lzma 733923 RMD160 1f1d4d8a86615fb455b76d5edcc92fe1a8ebf
 EBUILD libtool-1.3.5.ebuild 800 RMD160 6c4fea1ab669d1a1926f176476fcba1f1fc84483 SHA1 a0fafa46ce16604a62bd56efdc65196730bb9397 SHA256 1d937d795219f49d8231ec0e11963043e4586da182603425f5b475d24600f49f
 EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d
 EBUILD libtool-2.2.4.ebuild 1255 RMD160 ea8ee469a76064a717e49091576a598520fdfef0 SHA1 6970bc4cc405d28a5238da70bfde7771dd4c91dc SHA256 1edbbd94403641a68c0f6cc7a891921e8b2a1f265679c0d2c54e4da296068b54
-EBUILD libtool-2.2.6a.ebuild 1318 RMD160 7d37194a2def23a0940f58790f528c98baa7c89f SHA1 0f9dea93c013f706b7345d2ca1547e8cb1b6bee0 SHA256 eef64f9a3193c96b3148eb88ea2b0201809d658b349905df727d16c7d1fc3e7f
+EBUILD libtool-2.2.6a.ebuild 1370 RMD160 dea20e54741aa1df05122602f7c5bfd93cce3a15 SHA1 37db211f6f0e21186f4f01b854aafb9ca6c46d77 SHA256 03a5d00242aae24b5e8d4002c71a1acbdbfac57734a4d5257ee05303741c9873
 EBUILD libtool-9999.ebuild 1322 RMD160 d50ce91d8397b4b625dff1823ebc0568b3d41077 SHA1 2c48acd73319cb0b49673472f4fd5ba36fffb6d5 SHA256 4f482c366f3c070212bc182e69c185d10e34a254bc2e37c127deff3768d2650e
-MISC ChangeLog 21361 RMD160 9f4dd8c04db9feedc368791cb96336ee2f2b2170 SHA1 9a741399d93e4407107a0093f4eb1d563074b1f9 SHA256 3280100cb9ab29c57b3b76e60652ce967fa6c6a723060f2161b3fb60e96a56a2
+MISC ChangeLog 21509 RMD160 406b7a4b94a7b072dd62da2bf06f2662c627b4fc SHA1 6e630c80ca65f25c68c813889c669ac86872e4dc SHA256 2cceb230f7b20d762d2d5b3b49570cfc279e7fe2567c1e104527dc9a726f2117
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkkDt/wACgkQ67wieSYcaxeIbQCgzkLyNnhzBHaQ9jSnAUtE03PK
-wfsAoLCvUKi/Qqv3GU6EDOAsf2N7ugzM
-=cB8V
+iEYEARECAAYFAkkwc7UACgkQOeoy/oIi7uz4tACg3MyVMMdJZDkH6ALPS82Byakv
+ytEAnjV8DdlzU8Gt7Qfsuit7SpR+hW8d
+=eDFl
 -----END PGP SIGNATURE-----