Add fix from upstream for busted dir entries #198545 by Ulrich Mueller.

Package-Manager: portage-2.1.3.19

5 files changed, 107 insertions, 5 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index ce2632aabef8..5b839207e30b 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.87 2007/10/15 10:25:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.88 2007/11/12 07:25:39 vapier Exp $
+
+*texinfo-4.11-r1 (12 Nov 2007)
+
+  12 Nov 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.11-dir-entry.patch, +texinfo-4.11-r1.ebuild:
+  Add fix from upstream for busted dir entries #198545 by Ulrich Mueller.
 
   15 Oct 2007; Roy Marples <uberlord@gentoo.org> texinfo-4.11.ebuild:
   BSD keywords dropped for bug #195933. Restore once fixed.
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index d232807dde1a..7965f2cee4c6 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX makeinfo.patch 790 RMD160 7e55e2d176ce5b39a949df4927eb16208e3d6240 SHA1 2098b57f37d3277b3ee1abfdf95a3f400479d28f SHA256 638d84a5fe68c98801e2be0b70dd1b71241399da87139bc5826ead6c431f7ce2
 MD5 a0df107ca9e3036e2ee2d501343cbf2b files/makeinfo.patch 790
 RMD160 7e55e2d176ce5b39a949df4927eb16208e3d6240 files/makeinfo.patch 790
@@ -6,6 +9,10 @@ AUX mkinfodir 7318 RMD160 57fb7f4524acf84be5e805b9df6f4c435aa2e5b9 SHA1 31b41b79
 MD5 690fb86d0c0215155b1d18671099115a files/mkinfodir 7318
 RMD160 57fb7f4524acf84be5e805b9df6f4c435aa2e5b9 files/mkinfodir 7318
 SHA256 2361ed35848aba949fa9af03e16f2c83ab28f1ae11d1dd97f2c58fe619406e69 files/mkinfodir 7318
+AUX texinfo-4.11-dir-entry.patch 757 RMD160 50ba502f701c7e96ed91883e925e0e45e82ebec4 SHA1 6473b3ba35d6ca642899758183a87b6866c056ce SHA256 6a71f2938779d0f1c0531a49d7b97cde814b8352c29ae94dbfcb809da531ef3d
+MD5 d56740a437fef906f0206e8ae2bddd90 files/texinfo-4.11-dir-entry.patch 757
+RMD160 50ba502f701c7e96ed91883e925e0e45e82ebec4 files/texinfo-4.11-dir-entry.patch 757
+SHA256 6a71f2938779d0f1c0531a49d7b97cde814b8352c29ae94dbfcb809da531ef3d files/texinfo-4.11-dir-entry.patch 757
 AUX texinfo-4.8-bounds-check.patch 1163 RMD160 329f5f612248550ec1e3c6cc9400df2b9180ded4 SHA1 52dff66b2779b0a673fe8c4d7a15d058e7fbba06 SHA256 774e785f01b0a2976b9c050b9d55abbc9c002e2784ab42dd1061cfea13b33289
 MD5 bd3981e1fcbf0da681ff4b8b4bb7fa42 files/texinfo-4.8-bounds-check.patch 1163
 RMD160 329f5f612248550ec1e3c6cc9400df2b9180ded4 files/texinfo-4.8-bounds-check.patch 1163
@@ -28,6 +35,10 @@ RMD160 5214ae3b96e2714bba8e61c141dd32b6c0c31b66 files/texinfo-4.8-tempfile.patch
 SHA256 356935c23212eec139885d0217568c35e834a1abdd3b7fe062af0bb2da9fcd01 files/texinfo-4.8-tempfile.patch 708
 DIST texinfo-4.11.tar.bz2 1659601 RMD160 d07dbc50f98dd8f9f4088b58781abdebfb7f5781 SHA1 915a42e1278860b0fa64e4ef9d5ad4488d3b23a0 SHA256 61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7
 DIST texinfo-4.8.tar.bz2 1521822 RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 SHA1 b19e906f7220294c1e8b087d583c50f5c4d7c420 SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb
+EBUILD texinfo-4.11-r1.ebuild 1307 RMD160 c925080bf07b90ac06ea8ec5811887b423a6922e SHA1 9adb7a491df21929dcf2bd0fac2d5d4a4a2dc27f SHA256 95c45a34dda9728f2f1d9133626609ce35aede1c5699b2e0d3d54cde5d526c27
+MD5 fb4d417c74de5279c2cb5ee61836df7b texinfo-4.11-r1.ebuild 1307
+RMD160 c925080bf07b90ac06ea8ec5811887b423a6922e texinfo-4.11-r1.ebuild 1307
+SHA256 95c45a34dda9728f2f1d9133626609ce35aede1c5699b2e0d3d54cde5d526c27 texinfo-4.11-r1.ebuild 1307
 EBUILD texinfo-4.11.ebuild 1200 RMD160 515e8404e36883893f8d4db97b94208536eaf50e SHA1 50b1baab491b8c6ea2d64bcd2ec312dbb7e97f6e SHA256 283352115635d60248b684e94ed9ae96928325201a69bea0ce80abbeb2e7c83a
 MD5 4b3143e3b5156933f3a0d3cc22a60d01 texinfo-4.11.ebuild 1200
 RMD160 515e8404e36883893f8d4db97b94208536eaf50e texinfo-4.11.ebuild 1200
@@ -36,10 +47,10 @@ EBUILD texinfo-4.8-r5.ebuild 2264 RMD160 a7f72c42a76925628c82da89e8a73e9934f5b47
 MD5 18200985a9f9b3b9d132092f96fea31a texinfo-4.8-r5.ebuild 2264
 RMD160 a7f72c42a76925628c82da89e8a73e9934f5b47d texinfo-4.8-r5.ebuild 2264
 SHA256 6b5a9d6e35d07466094eda9fa273ad8695a49bba0d9b242ef5300823d14437ce texinfo-4.8-r5.ebuild 2264
-MISC ChangeLog 10003 RMD160 91eec6e937467e3a232dc14cf574f380399f54df SHA1 bcd790603a40733934c5fa0ea57058befb8935a2 SHA256 4063ff19756a3264e12fd54544aadcaaa63c364bf2fb6a98e4c67d7a9ecc5130
-MD5 3c54168b0a73ae83285dd5935512a18d ChangeLog 10003
-RMD160 91eec6e937467e3a232dc14cf574f380399f54df ChangeLog 10003
-SHA256 4063ff19756a3264e12fd54544aadcaaa63c364bf2fb6a98e4c67d7a9ecc5130 ChangeLog 10003
+MISC ChangeLog 10222 RMD160 0f58243ff7d90066b51164c34e2d803851af6bcc SHA1 652386e7f9ae3f3e3df72b480d721d23f903d46c SHA256 de1a385567d50cffea51f7cbab448ac553485fb85eb2e2aa7579cbb66a523456
+MD5 8b3b4442d7560c06ae370a2e9bd68b8e ChangeLog 10222
+RMD160 0f58243ff7d90066b51164c34e2d803851af6bcc ChangeLog 10222
+SHA256 de1a385567d50cffea51f7cbab448ac553485fb85eb2e2aa7579cbb66a523456 ChangeLog 10222
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -47,6 +58,16 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 741f82df53a4a3ddb2dd0393500c01a4 files/digest-texinfo-4.11 244
 RMD160 9d72563e1334207ab14e687ad03b8ce129d6a65c files/digest-texinfo-4.11 244
 SHA256 9f6b66a54b34b66a7c0f5b9c29e824f94a36b5c555f27084404d2e2e5a5441a5 files/digest-texinfo-4.11 244
+MD5 741f82df53a4a3ddb2dd0393500c01a4 files/digest-texinfo-4.11-r1 244
+RMD160 9d72563e1334207ab14e687ad03b8ce129d6a65c files/digest-texinfo-4.11-r1 244
+SHA256 9f6b66a54b34b66a7c0f5b9c29e824f94a36b5c555f27084404d2e2e5a5441a5 files/digest-texinfo-4.11-r1 244
 MD5 29bb9e8c5badabb1357af7f2e69f0f79 files/digest-texinfo-4.8-r5 241
 RMD160 854f817351e10a866caacd170b988b60c0538113 files/digest-texinfo-4.8-r5 241
 SHA256 75045d609cf165296a77fcee2f24f408b40d03462a18b787bf8334ee95b618d8 files/digest-texinfo-4.8-r5 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHN//5p/wUKkr7RBoRAnPjAKCn4+Z0yG+tsodyQDuhjQtJRvvVvQCglMsK
+k5ZDK4UZgkTTqB40B/vD/pE=
+=Mvwz
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.11-r1 b/sys-apps/texinfo/files/digest-texinfo-4.11-r1
new file mode 100644
index 000000000000..9b7071167155
--- /dev/null
+++ b/sys-apps/texinfo/files/digest-texinfo-4.11-r1
@@ -0,0 +1,3 @@
+MD5 c6bf13df4fbeff8ce874aacd6a51e814 texinfo-4.11.tar.bz2 1659601
+RMD160 d07dbc50f98dd8f9f4088b58781abdebfb7f5781 texinfo-4.11.tar.bz2 1659601
+SHA256 61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7 texinfo-4.11.tar.bz2 1659601
diff --git a/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch b/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch
new file mode 100644
index 000000000000..3a621d4909ec
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch
@@ -0,0 +1,24 @@
+fix from upstream
+
+http://bugs.gentoo.org/198545
+
+--- texinfo/makeinfo/cmds.c	2007/09/26 20:53:39	1.76
++++ texinfo/makeinfo/cmds.c	2007/10/13 23:44:34	1.77
+@@ -1631,10 +1631,14 @@
+ 
+       if (!no_headers && !html)
+         {
++          /* use add_* instead of insert_* because otherwise the
++             file header ("This is ...") will end up inside the
++             dir section markers.  */
+           kill_self_indent (-1); /* make sure there's no indentation */
+-          insert_string ("INFO-DIR-SECTION ");
+-          insert_string (line);
+-          insert ('\n');
++          cm_noindent (); /* make sure again */
++          add_word ("INFO-DIR-SECTION ");
++          add_word (line);
++          add_char ('\n');
+         }
+ 
+       free (line);
diff --git a/sys-apps/texinfo/texinfo-4.11-r1.ebuild b/sys-apps/texinfo/texinfo-4.11-r1.ebuild
new file mode 100644
index 000000000000..ac23106d7f4b
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.11-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.1 2007/11/12 07:25:39 vapier Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="http://www.gnu.org/software/texinfo/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls static"
+
+RDEPEND="!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# pull in ctype.h for misc string function prototypes
+	sed -i '1i#include <ctype.h>' system.h
+	epatch "${FILESDIR}"/${P}-dir-entry.patch #198545
+
+	# FreeBSD requires install-sh, but usptream don't have it marked
+	# exec, #195076
+	chmod +x build-aux/install-sh
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf $(use_enable nls) || die
+	emake || die "emake"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO
+	newdoc info/README README.info
+	newdoc makeinfo/README README.makeinfo
+
+	rm -f "${D}"/usr/lib/charset.alias #195148
+}