New version

8 files changed, 311 insertions, 50 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index 14fc7f02a6f7..1f221ba75252 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.9 2003/06/19 01:39:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.10 2003/11/08 05:42:56 obz Exp $
+
+*htmltidy-3.10.29 (08 Nov 2003)
+
+  08 Nov 2003; Mike Gardiner <obz@gentoo.org> htmltidy-2.7.18.ebuild,
+  htmltidy-3.10.29.ebuild, files/03-html2db-null.patch,
+  files/03-htmltidy-docbook.patch:
+  New version, 3.10.29, includes XML and html2db support if USE=xml. Version
+  2.7.18 has been removed in favour of 2.7.18-r1. Closes bug #32836
 
   18 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
   files/htmltidy-dbpatch.diff:
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index c569a6d091ef..304f49c8c20e 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,14 +1,11 @@
 MD5 5c39e3e077a15833a9eafef801b54f04 htmltidy-0.8.4.ebuild 1088
-MD5 a5f513aeb4507c1caa48cc3433998fca htmltidy-2.7.18.ebuild 1133
 MD5 8db241c2b8cfd63c40efa1b81104b8ee htmltidy-2.7.18-r1.ebuild 1229
-MD5 55b4ce1ed916ab8dbfb4829cb30313ef htmltidy-3.10.29.ebuild 2101
-MD5 e3f2ee752775c991b60cab69e8bc1a6e ChangeLog 1550
+MD5 041f4bd5be4b524fa8b5b0d33819de95 htmltidy-3.10.29.ebuild 2120
+MD5 81b237a6ccf42a7b0c28f4f0328d8c0b ChangeLog 1887
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 f7b208be84f4b958eacf5ebdc844ed58 .htmltidy-3.10.29.ebuild.swp 12288
 MD5 2fe7c73c1e39e2714ee35931b23b0b22 files/03-htmltidy-docbook.patch 2948
 MD5 121179b048496c0fabc8c209ab04e114 files/htmltidy-dbpatch.diff 30781
 MD5 725afc1d2a9f8301068214bb8a51e14d files/digest-htmltidy-2.7.18-r1 64
 MD5 969e47b8a4da6f69002add193ef04121 files/digest-htmltidy-0.8.4 59
-MD5 725afc1d2a9f8301068214bb8a51e14d files/digest-htmltidy-2.7.18 64
 MD5 e97d474e9517a0a945af252d243c455a files/digest-htmltidy-3.10.29 179
 MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
diff --git a/app-text/htmltidy/files/03-html2db-null.patch b/app-text/htmltidy/files/03-html2db-null.patch
new file mode 100644
index 000000000000..926f57b9caf6
--- /dev/null
+++ b/app-text/htmltidy/files/03-html2db-null.patch
@@ -0,0 +1,117 @@
+--- html2b-unpatched/html2db/main.c	2003-03-11 04:28:46.000000000 +0800
++++ html2db/main.c	2003-11-08 12:32:41.000000000 +0800
+@@ -75,8 +75,8 @@
+         doc = tidyDocToImpl( tdoc );
+         out = FileOutput(stdout, 0, '\n');
+         doc->docOut = out;
+-        PrintSgml( doc, 0, 0, doc->root );
+-        doc->docOut = null;
++        PrintSgml( doc, 0, 0, &( doc->root ) );
++        doc->docOut = NULL;
+     }
+     else {
+         fprintf(stderr, "Problem parsing file %s\n", file); 
+--- html2b-unpatched/html2db/pprint.c	2003-05-05 22:23:30.000000000 +0800
++++ html2db/pprint.c	2003-11-08 12:34:42.000000000 +0800
+@@ -341,7 +341,7 @@
+     Node *parent;
+     
+     for (parent = element->parent;
+-            parent != null; parent = parent->parent)
++            parent != NULL; parent = parent->parent)
+     {   if (parent->element && tmbstrcasecmp(parent->element, "address") == 0)
+             return yes;
+     }
+@@ -488,7 +488,7 @@
+     Bool xhtml = cfgBool( doc, TidyXhtmlOut);
+     uint spaces = cfg( doc, TidyIndentSpaces );
+ 
+-    if (node == null)
++    if (node == NULL)
+         return;
+     
+     if (node->type == TextNode) {
+@@ -521,7 +521,7 @@
+     else if (node->type == RootNode)
+     {
+         for (content = node->content;
+-                content != null;
++                content != NULL;
+                 content = content->next)
+            PrintSgml(doc, mode, indent, content);
+     }
+@@ -565,7 +565,7 @@
+             PFlushLine(doc, indent);
+ 
+             for (content = node->content;
+-                    content != null;
++                    content != NULL;
+                     content = content->next)
+                 PrintSgml(doc, (mode | PREFORMATTED | NOWRAP), 
+                             indent, content);
+@@ -574,7 +574,7 @@
+             PrintSgmlTag(doc, mode, indent, node, SgmlTagEnd);
+             PFlushLine(doc, indent);
+ 
+-            if ( !cfg(doc, TidyIndentContent) && node->next != null )
++            if ( !cfg(doc, TidyIndentContent) && node->next != NULL )
+                 PFlushLine(doc, indent);
+         }
+         else if (node->tag->model & CM_INLINE)
+@@ -586,7 +586,7 @@
+                 indent += spaces;
+ 
+                 for (content = node->content;
+-                        content != null;
++                        content != NULL;
+                         content = content->next)
+                     PrintSgml(doc, mode, indent, content);
+ 
+@@ -598,7 +598,7 @@
+             {
+ 
+                 for (content = node->content;
+-                        content != null;
++                        content != NULL;
+                         content = content->next)
+                     PrintSgml(doc, mode, indent, content);
+             }
+@@ -607,7 +607,7 @@
+         }
+         else 
+         {   PCondFlushLine(doc, indent);
+-/*            if (TidySmartIndent && node->prev != null)
++/*            if (TidySmartIndent && node->prev != NULL)
+                 PFlushLine(doc, indent);
+ */
+             PrintSgmlTag(doc, mode ,indent, node, SgmlTagStart);
+@@ -623,7 +623,7 @@
+                 indent += spaces;
+ 
+                 for (content = node->content;
+-                        content != null;
++                        content != NULL;
+                         content = content->next)
+                     PrintSgml(doc, mode, indent, content);
+                 PCondFlushLine(doc, indent);
+@@ -632,9 +632,9 @@
+             }
+             else
+             {   Node *last;
+-                last = null;
++                last = NULL;
+                 for (content = node->content;
+-                        content != null;
++                        content != NULL;
+                         content = content->next) {
+                     /* kludge for naked text before block level tag */
+                     if (last && !cfg(doc, TidyIndentContent) && 
+@@ -654,7 +654,7 @@
+             PrintSgmlTag(doc, mode, indent, node, SgmlTagEnd);
+             PFlushLine(doc, indent);
+             if (cfg(doc, TidyIndentContent) == no &&
+-                node->next != null &&
++                node->next != NULL &&
+                 TidyHideEndTags == no &&
+                 (node->tag->model & (CM_BLOCK|CM_LIST|CM_DEFLIST|CM_TABLE)))
+                 PFlushLine(doc, indent);
diff --git a/app-text/htmltidy/files/03-htmltidy-docbook.patch b/app-text/htmltidy/files/03-htmltidy-docbook.patch
new file mode 100644
index 000000000000..78f1082c43ab
--- /dev/null
+++ b/app-text/htmltidy/files/03-htmltidy-docbook.patch
@@ -0,0 +1,98 @@
+--- src/pprint.c.old	2003-11-08 13:01:16.000000000 +0800
++++ src/pprint.c	2003-11-08 13:03:05.000000000 +0800
+@@ -40,7 +40,7 @@
+ static int  TextEndsWithNewline( Lexer *lexer, Node *node, uint mode );
+ static int  TextStartsWithWhitespace( Lexer *lexer, Node *node, uint start, uint mode );
+ static Bool InsideHead( TidyDocImpl* doc, Node *node );
+-static Bool ShouldIndent( TidyDocImpl* doc, Node *node );
++Bool ShouldIndent( TidyDocImpl* doc, Node *node );
+ 
+ #if SUPPORT_ASIAN_ENCODINGS
+ /* #431953 - start RJ Wraplen adjusted for smooth international ride */
+@@ -706,7 +706,7 @@
+     }
+ }
+ 
+-static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
++void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
+ {
+     tmbchar entity[128];
+     ctmbstr p;
+@@ -941,7 +941,7 @@
+   to UTF-8 is deferred to the WriteChar() routine called
+   to flush the line buffer.
+ */
+-static void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
++void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
+                         Node* node  )
+ {
+     uint start = node->start;
+@@ -982,13 +982,11 @@
+     }
+ }
+ 
+-#if 0
+-static void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
++void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
+ {
+     while ( *str != '\0' )
+         AddChar( &doc->pprint, *str++ );
+ }
+-#endif /* 0 */
+ 
+ 
+ static void PPrintAttrValue( TidyDocImpl* doc, uint indent,
+@@ -1370,7 +1368,7 @@
+     AddChar( pprint, '>' );
+ }
+ 
+-static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
++void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
+ {
+     TidyPrintImpl* pprint = &doc->pprint;
+ 
+@@ -1454,7 +1452,7 @@
+     PCondFlushLine( doc, indent );
+ }
+ 
+-static void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
++void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
+ {
+     TidyPrintImpl* pprint = &doc->pprint;
+     tchar c;
+@@ -1485,7 +1483,7 @@
+     PCondFlushLine( doc, indent );
+ }
+ 
+-static void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
++void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
+ {
+     AttVal* att;
+     uint saveWrap;
+@@ -1574,7 +1572,7 @@
+     WrapOn( doc, saveWrap );
+ }
+ 
+-static void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
++void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
+ {
+     uint saveWrap;
+     TidyPrintImpl* pprint = &doc->pprint;
+@@ -1593,7 +1591,7 @@
+     WrapOn( doc, saveWrap );          /* restore wrapping */
+ }
+ 
+-static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
++void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
+ {
+     TidyPrintImpl* pprint = &doc->pprint;
+     Bool wrapSect = cfgBool( doc, TidyWrapSection );
+@@ -1900,7 +1898,7 @@
+ 
+ 
+ 
+-static Bool ShouldIndent( TidyDocImpl* doc, Node *node )
++Bool ShouldIndent( TidyDocImpl* doc, Node *node )
+ {
+     uint indentContent = cfg( doc, TidyIndentContent );
+     if ( indentContent == no )
diff --git a/app-text/htmltidy/files/digest-htmltidy-2.7.18 b/app-text/htmltidy/files/digest-htmltidy-2.7.18
deleted file mode 100644
index 40d794f8de51..000000000000
--- a/app-text/htmltidy/files/digest-htmltidy-2.7.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7694dcdb7d451b17477292d60186f477 tidy_src_020718.tgz 153771
diff --git a/app-text/htmltidy/files/digest-htmltidy-3.10.29 b/app-text/htmltidy/files/digest-htmltidy-3.10.29
new file mode 100644
index 000000000000..7cf42139df8d
--- /dev/null
+++ b/app-text/htmltidy/files/digest-htmltidy-3.10.29
@@ -0,0 +1,3 @@
+MD5 bb81e507333c019bc56fa7c3d1a6ef3b tidy_src_031029.tgz 239167
+MD5 54ab968e177bc92495fce324c18f8b52 tidy_docs.tgz 152720
+MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
diff --git a/app-text/htmltidy/htmltidy-2.7.18.ebuild b/app-text/htmltidy/htmltidy-2.7.18.ebuild
deleted file mode 100644
index 64bef03f5655..000000000000
--- a/app-text/htmltidy/htmltidy-2.7.18.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-2.7.18.ebuild,v 1.8 2003/02/13 09:39:21 vapier Exp $ /home/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-2.7.18.ebuild, v 1.5 2002/07/25 11:07:00 cybersystem Exp $
-
-# convert from normalized gentoo version number to htmltidy's wacky date thing
-parts=(${PV//./ })
-vers=$(printf "%02d%02d%02d" ${parts[0]} ${parts[1]} ${parts[2]})
-MY_P=tidy_src_${vers}
-S=${WORKDIR}/tidy
-
-DESCRIPTION="fix mistakes and tidy up sloppy editing in HTML and XML"
-SRC_URI="http://tidy.sourceforge.net/src/old/${MY_P}.tgz"
-HOMEPAGE="http://tidy.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND=""
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# skip "chown"
-	t=Makefile
-	cp $t $t.orig
-	sed 's:chgrp\|chown:#&:' $t.orig > $t
-}
-
-src_compile() {
-	emake OTHERCFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	make \
-		INSTALLDIR="${D}/usr/" \
-		MANPAGESDIR="${D}/usr/share/man" \
-		install || die
-}
diff --git a/app-text/htmltidy/htmltidy-3.10.29.ebuild b/app-text/htmltidy/htmltidy-3.10.29.ebuild
new file mode 100644
index 000000000000..a3a4950d5c65
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-3.10.29.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-3.10.29.ebuild,v 1.1 2003/11/08 05:42:56 obz Exp $
+
+# Convert gentoo version number x.y.z to date xyz for
+# tidy's source numbering by date
+parts=(${PV//./ })
+dates=$(printf "%02d%02d%02d" ${parts[0]} ${parts[1]} ${parts[2]})
+MY_P=tidy_src_${dates}
+S=${WORKDIR}/tidy
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="http://tidy.sourceforge.net/"
+SRC_URI="http://tidy.sourceforge.net/src/old/${MY_P}.tgz
+		 http://tidy.sourceforge.net/docs/tidy_docs.tgz
+		 xml? ( http://www.cise.ufl.edu/~ppadala/tidy/html2db.tar.gz )"
+LICENSE="GPL-2"
+
+IUSE="debug doc xml"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Required to setup the source dist for autotools
+	einfo "Setting up autotools for source build"
+	/bin/sh ./build/gnuauto/setup.sh > /dev/null
+
+	# Stop tidy from appending -O2 to our CFLAGS
+	sed -i -e "/save_cflags/s/\ \-O2//" configure.in
+
+	if [ `use xml` ]; then
+		# Apply the docbook patch to tidy sources
+		epatch ${FILESDIR}/03-${PN}-docbook.patch
+
+		# And the null -> NULL patch to html2db sources
+		cd ${WORKDIR}
+		epatch ${FILESDIR}/03-html2db-null.patch
+
+		# Point to the tidy source in the html2db Makefile
+		sed -i -e "/TIDYDIR\=/s:\.\.:${S}:" \
+			   -e "/LIBDIR\=/s:lib:src\/\.libs\/:" \
+			   ${WORKDIR}/html2db/Makefile
+
+	fi
+
+}
+
+src_compile() {
+
+	econf `use_enable debug` || die
+	emake || die
+
+	if [ `use xml` ]; then
+		cd ${WORKDIR}/html2db
+		make || die
+	fi
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+	use xml && dobin ${WORKDIR}/html2db/html2db
+
+	cd ${S}/htmldoc
+	# It seems the manual page installation in the Makefile's
+	# is commented out, so we need to install manually 
+	# for the moment. Please check this on updates.
+	mv man_page.txt tidy.1
+	doman tidy.1
+
+	# Install basic html documentation
+	dohtml *.html *.gif *.css
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	use doc && dohtml -r api
+
+}
+