Add a patch to fix docbook output; will be sent upstream as soon as I have the form signed.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 130 insertions, 1 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index d750ea32a45a..02d10aec7715 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.115 2012/05/23 23:05:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.116 2012/05/24 02:02:37 flameeyes Exp $
+
+*texinfo-4.13-r2 (24 May 2012)
+
+  24 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/texinfo-4.13-docbook.patch, +texinfo-4.13-r2.ebuild:
+  Add a patch to fix docbook output; will be sent upstream as soon as I have the
+  form signed.
 
   23 May 2012; Mike Frysinger <vapier@gentoo.org> texinfo-4.13-r1.ebuild:
   Inherit eutils eclass for epatch.
diff --git a/sys-apps/texinfo/files/texinfo-4.13-docbook.patch b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch
new file mode 100644
index 000000000000..0622b94f987b
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch
@@ -0,0 +1,66 @@
+--- texinfo-4.13.orig/makeinfo/cmds.c	2008-05-22 05:11:34.000000000 -0700
++++ texinfo-4.13/makeinfo/cmds.c	2012-05-23 18:31:57.108264307 -0700
+@@ -1560,7 +1560,7 @@ cm_setfilename (void)
+   char *filename;
+   get_rest_of_line (1, &filename);
+   /* warning ("`@%s %s' encountered and ignored", command, filename); */
+-  if (xml)
++  if (xml && !docbook)
+     add_word_args ("<setfilename>%s</setfilename>", filename);
+   free (filename);
+ }
+--- texinfo-4.13.orig/makeinfo/node.c	2008-07-05 16:59:47.000000000 -0700
++++ texinfo-4.13/makeinfo/node.c	2012-05-23 17:02:46.517345024 -0700
+@@ -1233,10 +1233,12 @@ cm_anchor (int arg)
+     }
+   else if (xml || docbook)
+     {
++      char *id = xml_id(anchor);
+       xml_insert_element_with_attribute (ANCHOR, START,
+ 					 docbook ? "id=\"%s\"" : "name=\"%s\"",
+-					 anchor);
++					 id);
+       xml_insert_element (ANCHOR, END);
++      free(id);
+     }
+ 
+   /* Save it in the tag table.  */
+--- texinfo-4.13.orig/makeinfo/xml.c	2008-02-12 17:00:55.000000000 -0800
++++ texinfo-4.13/makeinfo/xml.c	2012-05-23 17:20:13.698858895 -0700
+@@ -586,21 +586,27 @@ static int in_indexterm = 0;
+ char *
+ xml_id (char *id)
+ {
+-  char *tem = xmalloc (strlen (id) + 1);
++  /* Get an extra space to accomodate adding an i-prefix. */
++  char *tem = xmalloc (strlen (id) + 2);
+   char *p = tem;
+-  strcpy (tem, id);
++
++  /* First character cannot be a number, '-' or '.'. Just always add
++     an i if we're not starting with a alphanumeric character
++     already, to simplify the code.
++  */
++  if (!isalpha(*id))
++    {
++      *p++ = 'i';
++    }
++
++  strcpy (p, id);
++
+   while (*p)
+     {
+-      if (strchr (":\" \t\f\r\n", *p))
++      if (!isalnum (*p) && !strchr (":_.-", *p))
+         *p = '-';
+       p++;
+     }
+-  p = tem;
+-
+-  /* First character cannot be a number.  Clearly we should make this
+-     dependent on the actual numeral found.  */
+-  if (strchr ("0123456789", *p))
+-    *p = 'i';
+ 
+   return tem;
+ }
diff --git a/sys-apps/texinfo/texinfo-4.13-r2.ebuild b/sys-apps/texinfo/texinfo-4.13-r2.ebuild
new file mode 100644
index 000000000000..1466b36cebbf
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.13-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r2.ebuild,v 1.1 2012/05/24 02:02:37 flameeyes Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="http://www.gnu.org/software/texinfo/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="nls static"
+
+RDEPEND="!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xz.patch #269742
+	touch doc/install-info.1 #354589
+	epatch "${FILESDIR}"/${P}-texi2dvi-regexp-range.patch #311885
+	touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 #354589
+	epatch "${FILESDIR}"/${P}-accentenc-test.patch
+	# waiting to be sent upstream for my copyright assignment form to be
+	# ready - Flameeyes
+	epatch "${FILESDIR}"/${P}-docbook.patch
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	# Make cross-compiler safe (#196041)
+	if tc-is-cross-compiler ; then
+		emake -C tools/gnulib/lib || die
+	fi
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO
+	newdoc info/README README.info
+	newdoc makeinfo/README README.makeinfo
+}