Version bumped. This closes bug #57509.

5 files changed, 203 insertions, 8 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index 9ab052b92132..8b79d919ee64 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.19 2004/07/23 18:20:56 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.20 2004/08/18 00:01:21 usata Exp $
+
+*htmltidy-4.8.6 (18 Aug 2004)
+
+  18 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/04-htmltidy-docbook.patch, +htmltidy-4.8.6.ebuild:
+  Version bumped. This closes bug #57509.
 
   24 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> htmltidy-3.10.29.ebuild:
   Added to macos. This closes bug #58076
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 827c11612078..1b92ad11fe5e 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,13 +1,14 @@
+MD5 a5ce9f082dfab7ebf66a86ea51ba5098 ChangeLog 2866
+MD5 614a13345999a5eff251b9051afd4132 htmltidy-0.8.4.ebuild 1088
 MD5 fab3994b0bc2f50981ade6e42ba7486b htmltidy-2.7.18-r1.ebuild 1108
 MD5 0bb2c3d6dac29a6cefa2706df3c404fe htmltidy-2.7.18-r2.ebuild 1417
-MD5 de56dcbda95700d9cccefa9fe52cff92 htmltidy-3.10.29.ebuild 2488
-MD5 a5ce9f082dfab7ebf66a86ea51ba5098 ChangeLog 2866
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 614a13345999a5eff251b9051afd4132 htmltidy-0.8.4.ebuild 1088
-MD5 2fe7c73c1e39e2714ee35931b23b0b22 files/03-htmltidy-docbook.patch 2948
+MD5 ea1cbb8e6306c74d714df0595b656334 htmltidy-4.8.6.ebuild 2491
 MD5 969e47b8a4da6f69002add193ef04121 files/digest-htmltidy-0.8.4 59
-MD5 a96b41596c34f139192fe7733d075722 files/digest-htmltidy-2.7.18-r1 122
-MD5 a96b41596c34f139192fe7733d075722 files/digest-htmltidy-2.7.18-r2 122
 MD5 e97d474e9517a0a945af252d243c455a files/digest-htmltidy-3.10.29 179
-MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
+MD5 a96b41596c34f139192fe7733d075722 files/digest-htmltidy-2.7.18-r1 122
 MD5 121179b048496c0fabc8c209ab04e114 files/htmltidy-dbpatch.diff 30781
+MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
+MD5 2fe7c73c1e39e2714ee35931b23b0b22 files/03-htmltidy-docbook.patch 2948
+MD5 a96b41596c34f139192fe7733d075722 files/digest-htmltidy-2.7.18-r2 122
+MD5 ab95560a54298669b25a5973ed559b4e files/digest-htmltidy-4.8.6 179
diff --git a/app-text/htmltidy/files/04-htmltidy-docbook.patch b/app-text/htmltidy/files/04-htmltidy-docbook.patch
new file mode 100644
index 000000000000..5e6cb1cec139
--- /dev/null
+++ b/app-text/htmltidy/files/04-htmltidy-docbook.patch
@@ -0,0 +1,100 @@
+--- src/pprint.c.orig	2004-08-02 16:14:50.000000000 +0900
++++ src/pprint.c	2004-08-18 08:49:24.000000000 +0900
+@@ -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 */
+@@ -704,7 +704,7 @@
+     }
+ }
+ 
+-static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
++void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
+ {
+     tmbchar entity[128];
+     ctmbstr p;
+@@ -939,7 +939,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;
+@@ -980,15 +980,13 @@
+     }
+ }
+ 
+-#if 0
+-static void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
++void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
+ {
+ #pragma unused(indent)
+ 
+     while ( *str != '\0' )
+         AddChar( &doc->pprint, *str++ );
+ }
+-#endif /* 0 */
+ 
+ 
+ static void PPrintAttrValue( TidyDocImpl* doc, uint indent,
+@@ -1384,7 +1382,7 @@
+     AddChar( pprint, '>' );
+ }
+ 
+-static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
++void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
+ {
+     TidyPrintImpl* pprint = &doc->pprint;
+ 
+@@ -1471,7 +1469,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;
+@@ -1502,7 +1500,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;
+@@ -1590,7 +1588,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;
+@@ -1609,7 +1607,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 );
+@@ -1825,7 +1823,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-4.8.6 b/app-text/htmltidy/files/digest-htmltidy-4.8.6
new file mode 100644
index 000000000000..dfd4c9cf0bbc
--- /dev/null
+++ b/app-text/htmltidy/files/digest-htmltidy-4.8.6
@@ -0,0 +1,3 @@
+MD5 3a19c40fbd96fd6f6783668a1e6c59d6 tidy_src_040806.tgz 244076
+MD5 54ab968e177bc92495fce324c18f8b52 tidy_docs.tgz 152720
+MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
diff --git a/app-text/htmltidy/htmltidy-4.8.6.ebuild b/app-text/htmltidy/htmltidy-4.8.6.ebuild
new file mode 100644
index 000000000000..fad812238fef
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-4.8.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-4.8.6.ebuild,v 1.1 2004/08/18 00:01:21 usata Exp $
+
+inherit eutils
+
+# 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 )"
+
+DEPEND="virtual/libc
+	>=sys-devel/autoconf-2.5
+	>=sys-devel/automake-1.5"
+RDEPEND="virtual/libc"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~macos"
+IUSE="debug doc xml"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Required to setup the source dist for autotools
+	einfo "Setting up autotools for source build"
+	export WANT_AUTOMAKE=1.5 WANT_AUTOCONF=2.5
+	/bin/sh ./build/gnuauto/setup.sh > /dev/null
+
+	# Stop tidy from appending -O2 to our CFLAGS
+	sed -e "/save_cflags/s/\ \-O2//" configure.in > ${T}/configure.in &&
+	mv ${T}/configure.in configure.in || die "sed configure.in failed"
+
+	if use xml ; then
+		# Apply the docbook patch to tidy sources
+		epatch ${FILESDIR}/04-${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 -e "/TIDYDIR\=/s:\.\.:${S}:" \
+			   -e "/LIBDIR\=/s:lib:src\/\.libs\/:" \
+			   ${WORKDIR}/html2db/Makefile > ${T}/Makefile &&
+		mv ${T}/Makefile ${WORKDIR}/html2db/Makefile || die "sed Makefile failed"
+	fi
+}
+
+src_compile() {
+	export WANT_AUTOMAKE=1.5 WANT_AUTOCONF=2.5
+	econf `use_enable debug` || die
+	emake || die
+
+	if use xml ; then
+		cd ${WORKDIR}/html2db
+		emake || 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
+}