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

Package-Manager: portage-2.2_rc51/cvs/Linux i686

5 files changed, 44 insertions, 14 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/Manifest b/dev-util/indent/Manifest
index a74d22c9d3b8..451a2bdedba8 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,12 +1,13 @@
-AUX 2.2.10-man.patch 798 RMD160 0096ad9c69ef7f9f8c202861422415918044b502 SHA1 a92ac02507bcc8853788d8978c7d28154cd04598 SHA256 5828b38ad840dd5c7a748b0360bce004c00d107b3542a873e1158c91e29d8c59
+AUX 2.2.10-man.patch 579 RMD160 c1eb2c0078fda438c9614a987858efa52301f458 SHA1 58a053642de9971ec9eb5e14405b7a327c0528bb SHA256 a69b148c937005de02a016ab1e540d723c6cce813edeb45674fde35422cd661b
+AUX 2.2.10-segfault.patch 812 RMD160 6a0f1d488346ac2c0c137909aa42237dafca9b74 SHA1 2c5ff6c399c46f1385476079f031ee8d4e4e8333 SHA256 6b2c21173913dc7821e2d6060cb158a4f1d04f6b5d5ae095f528f9eb3eebf624
 AUX 2.2.9-deb-gentoo.patch 2703 RMD160 f488f350cac0d417b24e79396c1af7cb03ae8b80 SHA1 71fe4370c17bf2a5a8ef31a9dec8a3da4351efbe SHA256 618beb32203cf2f6534617228c2514778e87ebe1c318cd601626fccc1f3d6bea
 AUX 2.2.9-indent-off-segfault.patch 2373 RMD160 c20c26b52613a224fdebf14806e8c20715bb29a6 SHA1 add3448f0c3147725481733ea79e9dc55d93aa79 SHA256 f7ba070e58e735ff12658164cf795dc9ce925ca94797312721eb45c01364f933
 AUX 2.2.9-malloc.patch 350 RMD160 2a526ea6b59988863da4dcf9632eeea08412442c SHA1 7d231bab5176b2654f1e7eb04d6da365eb8ed5ff SHA256 9837927481894d785261ea803797b99a810eafe07a88de11ade0c5e6b5eccaa4
 DIST indent-2.2.10.tar.gz 702667 RMD160 66164db3f28ddc9726a56fb184795a335aac34b0 SHA1 20fa8a7a4af6670c3254c8b87020291c3db37ed1 SHA256 8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639
 DIST indent-2.2.9.tar.gz 678173 RMD160 ed858ace1479236ce24725b42c8490095ce06ada SHA1 9329422a366a77fca64102282a3ec99c0dd47b83 SHA256 0b9387bda5639ed54cf91bd607ab055624a07414f7f6882a75be97fd776ce466
-EBUILD indent-2.2.10-r1.ebuild 1029 RMD160 977b9427120fe3af1890f63dd149f8dd09f05772 SHA1 b1e730ecb00d74c720e5375c014eb3622021589e SHA256 24152fbf3ebd086886a3ed04ebc1c6731612267e8c0aa6f6ce59dccc6adee780
+EBUILD indent-2.2.10-r1.ebuild 1072 RMD160 ac7138cfb1e0d3ec22231cfc88a313017b42d87a SHA1 83ec414bcd0056694fe6c376d5ccea1b56360a26 SHA256 1e067a42e1fbec9d45b20c6e210565c4573735c210cbfec6e967cd7442dbe2ed
 EBUILD indent-2.2.10.ebuild 961 RMD160 c53e4d2aba9c1a6897b846894590dad6da607f13 SHA1 11d8508d6f303e2e818d3e2886e6ac55291f17be SHA256 27fb044c7545f529ab6df495d7140ab683967bac55c313cda348986e842e1907
 EBUILD indent-2.2.9-r3.ebuild 1099 RMD160 64517fbaf14cef9fde3611533440310917910656 SHA1 6c72cbde671429fb30387bc83c2339a087048d8a SHA256 854796483269e3a98e8783f1aff710ac9d24e2e5ff7c45897e3004230679a0b6
 EBUILD indent-2.2.9-r4.ebuild 1159 RMD160 8fba6deae27a97ae04dc29b73a6b21eba9f348b2 SHA1 61e1ca9657448ef0c4c50aa318e41955924d97ff SHA256 0b50e84183617ca00e11e6b3377f5e504c64778eee14afc78b55bbb06f95857e
-MISC ChangeLog 5371 RMD160 a1dac36871c98ea71c250c34bf6266417456ccd3 SHA1 e102db7516c370133f3c25ba67ea151813044de6 SHA256 691873c3771629782166f3b86932f3f9ab9abcecfe473e0daf6d3f9ff06a39a3
+MISC ChangeLog 5567 RMD160 7f028851adc18b0df9415b5baef2841bbdd613c6 SHA1 7c0e6738f7d8e9831876a628019fc66a114c43e9 SHA256 95593d81a540663f10c19a2bd1d0eede0700ae49441e4e62e5bf29cf856b4c06
 MISC metadata.xml 378 RMD160 e0004f4e0834f2ee5ecb021f19aef8dd1781114a SHA1 7c93aa280e8ca7a6ed7362aed8e401cbda8dc258 SHA256 fb963f2d31d88978beb0818d959ae0bc1d1453f7cf8ea5e8d4baa133f8234d4c
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
 }