Fix GNU Info files, bug 249130.

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

4 files changed, 48 insertions, 4 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 7cdc5966697d..2baa753f568f 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.124 2008/10/28 10:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.125 2008/11/28 07:28:08 ulm Exp $
+
+  28 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/gawk-3.1.6-gnuinfo.patch, gawk-3.1.6.ebuild:
+  Fix GNU Info files, bug 249130.
 
   28 Oct 2008; Raúl Porcel <armin76@gentoo.org> gawk-3.1.6.ebuild:
   alpha/ia64 stable #244384
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index b6d8db7de3e5..5c06690a849e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoconf-mktime-2.61.patch 1116 RMD160 516f7e7e92f0078726a0f48914fd686587b6a510 SHA1 f0ee67b2647b153c8de7823beeb24a0bb95f2c8f SHA256 e62bc5c6d3fa056be28d6928186998eba7e1850f29f089f707a6dbdb195dee33
 AUX filefuncs/Makefile 1212 RMD160 7b94f136f4a1e5cbfeade53c952c353378584c22 SHA1 e23965d28e8ae856b20211faedaca22cee613c11 SHA256 954bc6e837240b8d756cf6bd1460a24cae2a1cc5c738daf53746a0cff23791a1
 AUX filefuncs/filefuncs.c 10992 RMD160 326a54ea0cc42c819d44cf2a749cb141388c4ef0 SHA1 e31aa18db51077d6dc8aeaf979ecb02471f9175a SHA256 c647aa27170ef8e001d47bdf86c47809afd7f6d5a89be2f9769ce05b55ed8309
@@ -15,9 +18,17 @@ AUX gawk-3.1.5-num2str.patch 1319 RMD160 869a086ff89e25adfbf56e68de5df9d3aae7f61
 AUX gawk-3.1.5-numflags.patch 561 RMD160 485357e5d037edebd7e09e62a1f0deb582570ea1 SHA1 c6acabbc0adf5643808c5f25ca3faf54bd4c5690 SHA256 395bc2d5b623e253f566c62df4c623098201fa040c74ed430ea7e11846a23ff1
 AUX gawk-3.1.5-syntaxerror.patch 651 RMD160 0960bdb4ebfb4219a7ea1e3f9cf8d559f1d75d2c SHA1 0ffdfcaf2aefdc7922a6262e966c57e595028b41 SHA256 ebafc851e3dd109dd855e4072c82c6f274660bb7a5c8b338de05639870899044
 AUX gawk-3.1.5-wconcat.patch 495 RMD160 29f5eea5b300d8efc482e960b257292e5e5b19f8 SHA1 a40e527ef2741d8dea4e481852f887097dd2c921 SHA256 bc812044e12c291c0419853e3862e5dad60c17bfee8cffeb09135995b0694315
+AUX gawk-3.1.6-gnuinfo.patch 895 RMD160 2013db4a7e1b2557f567203576218f09e9e3f091 SHA1 8b9f8811beac46835530477fe82f0a6e7dad230b SHA256 e0e94e01bc061bdf41160fafc406e2c05bc6d27f3e26847899f020a01f46c98a
 DIST gawk-3.1.5.tar.gz 2310919 RMD160 8d875f4ea9e9ef5c932468cf43c691f6e082b197 SHA1 6cb385b4bc33780a5a4288b787523cbd4a30a900 SHA256 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8
 DIST gawk-3.1.6.tar.bz2 1861630 RMD160 e2639935d87d5c9fdb115a58ab1f598b69a76216 SHA1 fb45bded207af6a8e46cd63fcbb6fb064ecee607 SHA256 513fdd5a0bd1b467bd4993eb3adb4690f65fff6857c9e2ed1a3e46d72151cb6c
 EBUILD gawk-3.1.5-r5.ebuild 3678 RMD160 c7d94892fea66f8ced063f86842c78178165f63e SHA1 8ff21949e2366ce420c24fbc23d5a3dc78b1bb60 SHA256 f415f11c164d0be1a332729f6aa1664b9899cd5a648273cb8a618e1c05335156
-EBUILD gawk-3.1.6.ebuild 3132 RMD160 9f34d22452b0e48c351995a63f5ee5938da7b02a SHA1 7e5a39d7528029f0ac1ddfdfe1fda4998a5b6b60 SHA256 4b24fcba6a831a9dcf9e7fac30e4284229a8c2b666cbe6e81936ed87b04f5fc8
-MISC ChangeLog 17379 RMD160 f7cfac13a279c89c8ff8472d13dbe58646d5e804 SHA1 1f01d01ac622ae29da0ecb53c78fafd278747f8a SHA256 2c9008f1204c005a1b9f18d1dde25349cb3e78a6e9a7a4b3e785ff6fc7c76a7c
+EBUILD gawk-3.1.6.ebuild 3177 RMD160 7df0daeab87feb45fb14bb77896d488a4c011f91 SHA1 33eb8d3a65e4911e95cc335bf18e208261498da6 SHA256 a681935f280641537d5e83a8b70240b5884e4fbd75faaca3eb44e609acf4552a
+MISC ChangeLog 17511 RMD160 56be90a88cbf3e0a13ab8e9025c7a093a69af4f5 SHA1 49fd97b7a3628718da3965657151a46a7075b915 SHA256 041483d348f13d3488e4fed8636ee787cd36385e1e235fe97a1b57a34e5097dc
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkkvna8ACgkQOeoy/oIi7uxTXgCgq1kqnDMu05+hYLC4/FN4YgB0
+sqsAoKe5p17zSiHxaxA16lTXY1I3H7rj
+=LX1v
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch b/sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch
new file mode 100644
index 000000000000..3c753439438f
--- /dev/null
+++ b/sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch
@@ -0,0 +1,28 @@
+Fix broken Info files produced by texinfo 4.11
+http://bugs.gentoo.org/249130
+
+--- gawk-3.1.6/doc/gawkinet.info
++++ gawk-3.1.6/doc/gawkinet.info
+@@ -1,7 +1,8 @@
++This is gawkinet.info, produced by makeinfo version 4.13 from
++gawkinet.texi.
++
+ INFO-DIR-SECTION Network applications
+ START-INFO-DIR-ENTRY
+-This is gawkinet.info, produced by makeinfo version 4.11 from gawkinet.texi.
+-
+ * Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
+ END-INFO-DIR-ENTRY
+ 
+--- gawk-3.1.6/doc/gawk.info
++++ gawk-3.1.6/doc/gawk.info
+@@ -1,7 +1,7 @@
++This is gawk.info, produced by makeinfo version 4.13 from gawk.texi.
++
+ INFO-DIR-SECTION Text creation and manipulation
+ START-INFO-DIR-ENTRY
+-This is gawk.info, produced by makeinfo version 4.11 from gawk.texi.
+-
+ * Gawk: (gawk).                 A text scanning and processing language.
+ END-INFO-DIR-ENTRY
+ INFO-DIR-SECTION Individual utilities
diff --git a/sys-apps/gawk/gawk-3.1.6.ebuild b/sys-apps/gawk/gawk-3.1.6.ebuild
index 02f4551c0139..2a0487344922 100644
--- a/sys-apps/gawk/gawk-3.1.6.ebuild
+++ b/sys-apps/gawk/gawk-3.1.6.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-apps/gawk/gawk-3.1.6.ebuild,v 1.10 2008/10/28 10:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.6.ebuild,v 1.11 2008/11/28 07:28:08 ulm Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/autoconf-mktime-2.61.patch #220040
 	epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch
+	epatch "${FILESDIR}"/${P}-gnuinfo.patch #249130
 }
 
 src_compile() {