# 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.45 2010/02/13 16:23:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.46 2010/03/04 04:57:43 jer Exp $
+
+ 04 Mar 2010; Jeroen Roovers <jer@gentoo.org>
+ -files/2.2.9-deb-gentoo.patch, -indent-2.2.9-r3.ebuild,
+ -files/2.2.9-indent-off-segfault.patch, -indent-2.2.9-r4.ebuild,
+ -files/2.2.9-malloc.patch, -indent-2.2.10.ebuild:
+ Remove old.
13 Feb 2010; Raúl Porcel <armin76@gentoo.org> indent-2.2.10-r1.ebuild:
alpha/arm/ia64/s390/sh stable wrt #302346
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 1185 RMD160 c357be447f616b431ab40a0da34a7de72fb7900f SHA1 400ea5b3638b33bca4f43b5b476e8a9dc86639a1 SHA256 58717f9613a484617f3097d7f045090b2d68a51151bccd57babbe960c18249f8
-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 6424 RMD160 a77d3dd2f0a3548fa5c1ec3def56bf6dec95bc58 SHA1 0650e7b51ef66b0afb3b6cf939e5603d30dac94c SHA256 c10ed4200c52824962972f3c234b9d5ce84251c7fdf76a5aa1e243d3557c1d2b
+MISC ChangeLog 6659 RMD160 ad725be029e8a25234b1d8b442c0ccf0e134109b SHA1 61dc8bcfb858a091cb65d9004193a0dee330bfed SHA256 1cb14b62e413cf6434514f68ed06f1fc4f57d0441c043455c8731c0f16afa373
MISC metadata.xml 378 RMD160 e0004f4e0834f2ee5ecb021f19aef8dd1781114a SHA1 7c93aa280e8ca7a6ed7362aed8e401cbda8dc258 SHA256 fb963f2d31d88978beb0818d959ae0bc1d1453f7cf8ea5e8d4baa133f8234d4c
+++ /dev/null
-This patch is mostly from the debian indent_2.2.9-6.diff.
-
-Also added a patch to check usage of `texinfo2man`.
-http://bugs.gentoo.org/show_bug.cgi?id=71690
-
---- indent-2.2.9.orig/man/texinfo2man.c
-+++ indent-2.2.9/man/texinfo2man.c
-@@ -2,6 +2,7 @@
- #include <malloc.h>
- #include <string.h>
- #include <ctype.h>
-+#include <stdlib.h>
-
- /* texinfo2man.
- * Convert a texinfo document to man format.
-@@ -162,7 +163,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;
-@@ -252,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");
---- indent-2.2.9.orig/src/output.c
-+++ indent-2.2.9/src/output.c
-@@ -13,8 +13,10 @@
-
- #include <stdio.h>
- #include <sys/types.h>
-+#include <time.h>
- #include <utime.h>
- #include <sys/stat.h>
-+#include <stdlib.h>
-
- #include "indent.h"
- #include "sys.h"
-@@ -1206,7 +1208,7 @@
- }
- }
-
--extern inhibit_indenting(
-+extern void inhibit_indenting(
- BOOLEAN flag)
- {
- inhibited = flag;
---- indent-2.2.9.orig/src/indent.h
-+++ indent-2.2.9/src/indent.h
-@@ -96,8 +96,6 @@
- /* Size of the input program, not including the ' \n\0' we add at the end */
- extern unsigned long in_prog_size;
-
--/* The output file. */
--extern FILE *output;
-
-
-
---- indent-2.2.9.orig/src/indent.c
-+++ indent-2.2.9/src/indent.c
-@@ -875,6 +875,7 @@
- * imply we are in a stmt */
- for (t_ptr = s_code; *t_ptr; ++t_ptr)
- {
-+ check_lab_size();
- *e_lab++ = *t_ptr; /* turn everything so far into a label */
- }
-
-@@ -3062,8 +3063,8 @@
- BOOLEAN using_stdin = false;
- exit_values_ty exit_status;
-
--#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
-- setlocale (LC_MESSAGES, "");
-+#if defined (HAVE_SETLOCALE)
-+ setlocale (LC_ALL, "");
- #endif
- bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
---- indent-2.2.9.orig/src/comments.c
-+++ indent-2.2.9/src/comments.c
-@@ -20,6 +20,7 @@
- #include "comments.h"
- #include "globs.h"
- #include "parse.h"
-+#include "output.h"
-
- RCSTAG_CC ("$Id: 2.2.9-deb-gentoo.patch,v 1.2 2005/01/04 08:23:53 vapier Exp $");
-
---- indent-2.2.9.orig/src/output.h
-+++ indent-2.2.9/src/output.h
-@@ -47,7 +47,7 @@
- struct stat * file_stats,
- const char * filename);
-
--extern inhibit_indenting(
-+extern void inhibit_indenting(
- BOOLEAN flag);
-
-
+++ /dev/null
-diff -ur indent-2.2.9.orig/src/indent.c indent-2.2.9/src/indent.c
---- indent-2.2.9.orig/src/indent.c 2002-10-28 12:00:56.000000000 -0800
-+++ indent-2.2.9/src/indent.c 2006-08-01 16:13:42.000000000 -0700
-@@ -103,6 +103,7 @@
- unsigned long in_prog_size = 0U;
- char * in_prog = NULL;
- int break_line = 0;
-+BOOLEAN inhibited = 0; /* Whether or not reformatting is currently disabled */
-
- /* The position that we will line the current line up with when it comes time
- * to print it (if we are lining up to parentheses). */
-@@ -2036,12 +2038,24 @@
- BOOLEAN * force_nl,
- BOOLEAN * flushed_nl)
- {
-+ BOOLEAN save_inhibited;
-+
- if (parser_state_tos->last_saw_nl && (s_code != e_code))
- {
-+ /* remember if this comment is actually *INDENT-OFF* directive */
-+ save_inhibited = inhibited;
-+
- *flushed_nl = false;
- dump_line(true, &paren_target);
- parser_state_tos->want_blank = false;
- *force_nl = false;
-+
-+ /* if the comment was *INDENT-OFF* directive, it has been used up already
-+ * by dump_line() above so return now */
-+ if (save_inhibited)
-+ {
-+ return;
-+ }
- }
- print_comment (&paren_target);
- }
-diff -ur indent-2.2.9.orig/src/indent.h indent-2.2.9/src/indent.h
---- indent-2.2.9.orig/src/indent.h 2002-11-10 13:02:48.000000000 -0800
-+++ indent-2.2.9/src/indent.h 2006-08-01 16:13:37.000000000 -0700
-@@ -124,6 +122,8 @@
-
- extern int break_line; /* Whether or not we should break the line. */
-
-+extern BOOLEAN inhibited; /* Whether or not reformatting is currently disabled */
-+
- /* pointer to the token that lexi() has just found */
- extern char *token;
-
-diff -ur indent-2.2.9.orig/src/output.c indent-2.2.9/src/output.c
---- indent-2.2.9.orig/src/output.c 2002-12-12 09:36:49.000000000 -0800
-+++ indent-2.2.9/src/output.c 2006-08-01 16:13:34.000000000 -0700
-@@ -24,7 +26,6 @@
- RCSTAG_CC ("$Id: 2.2.9-indent-off-segfault.patch,v 1.1 2006/07/31 06:10:31 wormo Exp $");
-
- static FILE * output = NULL;
--static BOOLEAN inhibited = 0;
- static buf_break_st_ty * buf_break_list = NULL;
-
- /* Priority mask bits */
+++ /dev/null
-diff -ur indent-2.2.9/man/texinfo2man.c indent-2.2.9-freebsd/man/texinfo2man.c
---- indent-2.2.9/man/texinfo2man.c 2002-01-17 20:28:51.000000000 +0100
-+++ indent-2.2.9-freebsd/man/texinfo2man.c 2005-07-30 11:13:26.616498832 +0200
-@@ -1,5 +1,5 @@
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-
+++ /dev/null
-# 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.ebuild,v 1.2 2009/11/23 03:46:41 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="http://www.gnu.org/software/indent/indent.html"
-SRC_URI="mirror://gnu/indent/${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 )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- # Update timestamp so it isn't regenerated #76610
- touch -r man/Makefile.am man/texinfo2man.c
-}
-
-src_configure() {
- # LINGUAS is used in aclocal.m4 #94837
- unset LINGUAS
- econf $(use_enable nls) || die
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- htmldir="/usr/share/doc/${PF}/html" \
- install || die "make install failed"
- dodoc AUTHORS NEWS README*
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/indent-2.2.9-r3.ebuild,v 1.12 2007/08/06 19:39:16 uberlord Exp $
-
-inherit eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="http://www.gnu.org/software/indent/indent.html"
-SRC_URI="mirror://gnu/indent/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PV}-deb-gentoo.patch
- epatch "${FILESDIR}"/${PV}-malloc.patch
- epatch "${FILESDIR}"/${PV}-indent-off-segfault.patch # #125648
-
- # Update timestamp so it isn't regenerated #76610
- touch -r man/Makefile.am man/texinfo2man.c
-}
-
-src_compile() {
- econf $(use_enable nls) || die
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS NEWS README*
- dohtml "${D}"/usr/doc/indent/*
- rm -r "${D}"/usr/doc
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/indent-2.2.9-r4.ebuild,v 1.2 2007/08/06 19:39:16 uberlord Exp $
-
-inherit eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="http://www.gnu.org/software/indent/indent.html"
-SRC_URI="mirror://gnu/indent/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PV}-deb-gentoo.patch
- epatch "${FILESDIR}"/${PV}-malloc.patch
- epatch "${FILESDIR}"/${PV}-indent-off-segfault.patch # #125648
-
- # Update timestamp so it isn't regenerated #76610
- touch -r man/Makefile.am man/texinfo2man.c
-}
-
-src_compile() {
- # LINGUAS is used in aclocal.m4 #94837
- unset LINGUAS
- econf $(use_enable nls) || die
- emake || die "emake failed"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- htmldir="/usr/share/doc/${PF}/html" \
- install || die "make install failed"
- dodoc AUTHORS NEWS README*
-}