Do install texinfo2man but reapply the usage patch (bug #71690).

(Portage version: 2.2_rc51/cvs/Linux i686)

4 files changed, 40 insertions, 11 deletions

diff --git a/dev-util/indent/ChangeLog b/dev-util/indent/ChangeLog
index ade970562cb3..ea3b435bf7d2 100644
--- a/dev-util/indent/ChangeLog
+++ b/dev-util/indent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/indent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.36 2009/11/23 03:46:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.37 2009/11/23 05:16:02 jer Exp $
+
+  23 Nov 2009; Jeroen Roovers <jer@gentoo.org> files/2.2.10-man.patch,
+  indent-2.2.10-r1.ebuild, +files/2.2.10-segfault.patch:
+  Do install texinfo2man but reapply the usage patch (bug #71690).
 
 *indent-2.2.10-r1 (23 Nov 2009)
 
diff --git a/dev-util/indent/files/2.2.10-man.patch b/dev-util/indent/files/2.2.10-man.patch
index 1546f69bb931..30a6460c07a8 100644
--- a/dev-util/indent/files/2.2.10-man.patch
+++ b/dev-util/indent/files/2.2.10-man.patch
@@ -1,17 +1,9 @@
-* Set EXTRA_PROGRAMS to build texinfo2man but not install it.
 * Make sure it's built before it's used (thanks to Drake Wyrm).
 
 
 --- indent-2.2.10/man/Makefile.am.orig	2008-03-11 19:50:42.000000000 +0100
 +++ indent-2.2.10/man/Makefile.am	2009-11-23 04:11:17.000000000 +0100
-@@ -1,6 +1,6 @@
- mandir = @mandir@
- 
--bin_PROGRAMS = texinfo2man
-+EXTRA_PROGRAMS = texinfo2man
- texinfo2man_SOURCES = texinfo2man.c
- man_MANS = @PACKAGE@.1
- 
+
 @@ -10,6 +10,6 @@
  
  MAINTAINERCLEANFILES = @PACKAGE@.1 Makefile.in texinfo2man 
diff --git a/dev-util/indent/files/2.2.10-segfault.patch b/dev-util/indent/files/2.2.10-segfault.patch
new file mode 100644
index 000000000000..372a3db2e82f
--- /dev/null
+++ b/dev-util/indent/files/2.2.10-segfault.patch
@@ -0,0 +1,32 @@
+--- indent-2.2.10/man/texinfo2man.c.orig	2008-03-11 19:50:42.000000000 +0100
++++ indent-2.2.10/man/texinfo2man.c	2009-11-23 06:06:43.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ /* texinfo2man.
+  * Convert a texinfo document to man format.
+@@ -163,7 +164,7 @@
+ 
+ static char value_updated[64], value_edition[64], value_version[64];
+ 
+-process_texi (FILE * in)
++void process_texi (FILE * in)
+ {
+   char buf[1024];
+   int in_block = 0;
+@@ -253,6 +254,12 @@
+     char buf[1024];
+     int line_no = 0;
+ 
++	if (argc != 3) {
++		fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++		fprintf(stderr, "  The man page will be written to stdout.\n");
++		return -1;
++	}
++
+     texinfoname = argv[2];
+ 
+     in = fopen (argv[2], "r");
diff --git a/dev-util/indent/indent-2.2.10-r1.ebuild b/dev-util/indent/indent-2.2.10-r1.ebuild
index 8ec45069be18..07c550202e4d 100644
--- a/dev-util/indent/indent-2.2.10-r1.ebuild
+++ b/dev-util/indent/indent-2.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/indent-2.2.10-r1.ebuild,v 1.1 2009/11/23 03:46:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/indent-2.2.10-r1.ebuild,v 1.2 2009/11/23 05:16:02 jer Exp $
 
 EAPI="2"
 
@@ -22,6 +22,7 @@ src_prepare() {
 	# Fix parallel make issue in man/ (bug #76610)
 	# and do not install texinfo2man
 	epatch "${FILESDIR}"/${PV}-man.patch
+	epatch "${FILESDIR}"/${PV}-segfault.patch
 	eautoreconf
 }