Add texi2html-5 patch by Michael (kensington, bug #410767). Reinstate LINGUAS (bug #94837 revisited).

(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)

3 files changed, 109 insertions, 2 deletions

diff --git a/dev-util/indent/ChangeLog b/dev-util/indent/ChangeLog
index c90fd3cec329..6d0a657e797e 100644
--- a/dev-util/indent/ChangeLog
+++ b/dev-util/indent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/indent
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.54 2010/05/30 18:22:20 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.55 2012/04/04 16:07:42 jer Exp $
+
+*indent-2.2.11-r1 (04 Apr 2012)
+
+  04 Apr 2012; Jeroen Roovers <jer@gentoo.org> +indent-2.2.11-r1.ebuild,
+  +files/2.2.11-texi2html-5.patch:
+  Add texi2html-5 patch by Michael (kensington, bug #410767). Reinstate LINGUAS
+  (bug #94837 revisited).
 
   30 May 2010; Raúl Porcel <armin76@gentoo.org> indent-2.2.11.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #318809
diff --git a/dev-util/indent/files/2.2.11-texi2html-5.patch b/dev-util/indent/files/2.2.11-texi2html-5.patch
new file mode 100644
index 000000000000..5bad3da2867b
--- /dev/null
+++ b/dev-util/indent/files/2.2.11-texi2html-5.patch
@@ -0,0 +1,40 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -34,14 +34,14 @@
+ html-split: @PACKAGE@_toc.html
+ 
+ @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
+-	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
++	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
+ 
+ @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
+ 	case "$(TEXI2HTML)" in \
+ 	  *"/missing texi2html") \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
+ 	  *) $(RM) @PACKAGE@_*.html ; \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
+ 	esac
+ 
+ install-html-monolithic: @PACKAGE@.html
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -663,14 +663,14 @@
+ html-split: @PACKAGE@_toc.html
+ 
+ @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
+-	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
++	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
+ 
+ @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
+ 	case "$(TEXI2HTML)" in \
+ 	  *"/missing texi2html") \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
+ 	  *) $(RM) @PACKAGE@_*.html ; \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
+ 	esac
+ 
+ install-html-monolithic: @PACKAGE@.html
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
new file mode 100644
index 000000000000..3c210f067bd1
--- /dev/null
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/indent-2.2.11-r1.ebuild,v 1.1 2012/04/04 16:07:42 jer Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Indent program source files"
+HOMEPAGE="http://indent.isidore-it.eu/beautify.html"
+SRC_URI="http://${PN}.isidore-it.eu/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	app-text/texi2html
+"
+RDEPEND="
+	nls? ( virtual/libintl )
+"
+
+INDENT_LINGUAS="
+	ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
+"
+
+for indent_lingua in ${INDENT_LINGUAS}; do
+	IUSE+=" linguas_${indent_lingua}"
+done
+
+src_prepare() {
+	# Fix bug #94837
+	local pofile
+	for pofile in po/zh_TW*; do
+		mv ${pofile} ${pofile/.Big5} || die
+	done
+	sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
+
+	epatch \
+		"${FILESDIR}"/${PV}-segfault.patch \
+		"${FILESDIR}"/${PV}-texi2html-5.patch
+	eautomake
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_test() {
+	emake -C regression/
+}
+
+src_install() {
+	# htmldir as set in configure is ignored in doc/Makefile*
+	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
+}