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

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

4 files changed, 117 insertions, 10 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/Manifest b/dev-util/indent/Manifest
index 21ee51b43f2f..0c00f6759480 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 2.2.11-segfault.patch 369 RMD160 3f96760caf1ad85f7b96ab9b2e8fe752e4063f6f SHA1 31a6dcd5edcac4decac81dbb52bc9415b8b148e4 SHA256 63c66b49831a90c5191cd3295d17a4e1888d8fa2a0b02589448de3b78d4e0293
+AUX 2.2.11-texi2html-5.patch 2666 RMD160 1e290e6d676c0b642c6f3da2d167995f654d7614 SHA1 7acf627fe95686ea091882583176500d02bbaf0f SHA256 34451f004e0f9750df4a239cad6e30c0e63c702054f41b27c98eeb8fbcf6a356
 DIST indent-2.2.11.tar.gz 778563 RMD160 b2e472fe85ce386fe61ab23f92242dad5184a08d SHA1 9b242528bbc4914464117c69ffae9df24d3fa4a7 SHA256 aaff60ce4d255efb985f0eb78cca4d1ad766c6e051666073050656b6753a0893
+EBUILD indent-2.2.11-r1.ebuild 1383 RMD160 3286b027617dfe66d265b09afa78303fb1b4d417 SHA1 7eff0535a38621a21369db08f0eea46792c8fb20 SHA256 f093631dd3884850d90a5698ed6f8f3af5f684be81ea3d1960dba2b911fae198
 EBUILD indent-2.2.11.ebuild 1034 RMD160 c478b268742d62b1b942ca68a28f0982b72ab65a SHA1 9948e6c090c7e16c7cb50d07364aca00658035ab SHA256 bd94e0f1b4062476113afa0f7098cecaf0a38baf13204e3ef7ca26bb5494140e
-MISC ChangeLog 7597 RMD160 ba6c85a84e6e01beb7fa2da22e36fbaef0f53703 SHA1 788d5bc9f83e2e72c80c52df1b69ddcce7b77f39 SHA256 be50ab74bdca38f69a7975fb065d970608cc662326f31e7e129316a08520af12
+MISC ChangeLog 7841 RMD160 f71113d7daac7b2c74112758661418c6a23f2683 SHA1 bd66bbbb29fefa3c2308712c92ab9e35cfc7c500 SHA256 6387bf5f8a50ba99e685a4d9e92fb170cf82a2f51b8479961d7617466227d1f1
 MISC metadata.xml 357 RMD160 810a69ca7da416ce09e152c6180ac1f0d8cc2e96 SHA1 8d07e3c50fbd18cbd74cf093f918aa32c93c7d64 SHA256 dca422f0f96cb248c47e436195eb2ce9bd5bc4748b76db16949de324fcab65e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m4AACgkQfXuS5UK5QB3NqgP/QVttK16RAGj8r8lTi8ZHE/E9
-X3o7MGYJ+/fQeEkTZ2ma8ZDmcZ+X8VR6rafLYX1KuLl7bWEBZWa21XbULpbiJZqX
-AokN7OuN8NgjrSsieXWkZIkv4CqIywy93eHk35KENPKZhpDr//0c8NaJPjDEqajj
-xqRl4Oq2RR+Wlg8bCwU=
-=/Saq
+iEYEARECAAYFAk98cdQACgkQVWmRsqeSphOv7ACdHc9dw/ZrWz1SxaXvEGadHCkE
+sBcAnjwpuModQjsc2P8gsW49cuA5oM4o
+=w4T+
 -----END PGP SIGNATURE-----
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
+}