Version bump thanks to Jesse Adelman <jesse@boldandbusted.com>, bug 106142.

(Portage version: 2.1_pre4-r1)

6 files changed, 248 insertions, 12 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index 6eb55e432e8f..6b683fb6f44b 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/htmltidy
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.29 2005/01/01 16:20:45 eradicator Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.30 2006/02/13 17:38:10 ehmsen Exp $
+
+*htmltidy-5.10.26 (13 Feb 2006)
+
+  13 Feb 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/htmltidy-5.10.26-strip-O2-flag.patch,
+  +files/05-htmltidy-docbook.patch, +htmltidy-5.10.26.ebuild:
+  Version bump thanks to Jesse Adelman <jesse@boldandbusted.com>, bug #106142.
 
   07 Nov 2004; Markus Rothe <corsair@gentoo.org> htmltidy-4.8.6.ebuild:
   Stable on ppc64; bug #60442
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index edaccba16b52..c63767fe8d39 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,19 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a6d6edcf4da99914dbbd28d474651745 ChangeLog 4080
+RMD160 39ff4b0078ffd2763ba25d2414be0a1df6991dbe ChangeLog 4080
+SHA256 98224e15d88f74977d8482e8e1f63f5ef80d609f2086eb1145dd09dfeca9f837 ChangeLog 4080
 MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
+RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 files/03-html2db-null.patch 4249
+SHA256 9a8544d4070d7794ae65a3b75cb398e37c447c3cd5ec5e89306fab765d85cbb5 files/03-html2db-null.patch 4249
 MD5 2fe7c73c1e39e2714ee35931b23b0b22 files/03-htmltidy-docbook.patch 2948
+RMD160 75e14983a769f2a2cf06f1c8a4152af4b3ccfe77 files/03-htmltidy-docbook.patch 2948
+SHA256 5279fcc00d26c35f7bbbac6e513cf4d3dcb71411da9dd76793b71c069eb3fde9 files/03-htmltidy-docbook.patch 2948
 MD5 3e05bf3979c6a34b1b4166a2caee4024 files/04-htmltidy-docbook.patch 2975
+RMD160 2f04472d478fc587546fab768c681ce93d4f0681 files/04-htmltidy-docbook.patch 2975
+SHA256 ed90c549513c04a62da53f8bb72de131b1d08ac4fc0a74709f12820d8264a430 files/04-htmltidy-docbook.patch 2975
+MD5 cdf143e35317ba6b793c553a3b59453d files/05-htmltidy-docbook.patch 3039
+RMD160 9afbf7e653db20d31bc0811c5e5c9ee3565356cb files/05-htmltidy-docbook.patch 3039
+SHA256 6b4f6562dc1e5e5425368e3bec533ae0e9866e2cf216b8c284d3f3fca706089f files/05-htmltidy-docbook.patch 3039
 MD5 501b4fb1a986d22c54e6e00429ebcf56 files/digest-htmltidy-3.10.29 186
+RMD160 f4c0989e758caead1fb64644c909ab9c506c0bee files/digest-htmltidy-3.10.29 186
+SHA256 fd5fc5f2ad7234f5480dcee70776f534cbc9347317f2a1f6b7b81ccd18739bda files/digest-htmltidy-3.10.29 186
 MD5 77631526ec9513a440167223556fb2f8 files/digest-htmltidy-4.8.6 186
+RMD160 7709303ec354c77f18940078dea649fde66536b1 files/digest-htmltidy-4.8.6 186
+SHA256 f910f5bb140931a6456e6dc47225f526a9936bc51d28a256f0d17525e2e9a66f files/digest-htmltidy-4.8.6 186
+MD5 9edfc2d50e2a2c14fe3cfd2a3b578746 files/digest-htmltidy-5.10.26 696
+RMD160 295401a377a4049de67c72e469deb4200085f2f9 files/digest-htmltidy-5.10.26 696
+SHA256 77b1635ade4f1686de35f358642122736becd8604707b5a0545e763145c034ca files/digest-htmltidy-5.10.26 696
+MD5 ebe044e39a2d860207dcd7538231a3df files/htmltidy-5.10.26-strip-O2-flag.patch 370
+RMD160 1e531a13a61c80053cfb886a29cf2b4bafe45400 files/htmltidy-5.10.26-strip-O2-flag.patch 370
+SHA256 6acd356327faa4043a0b4cf5f242a5249d32c136fc39594701aca67ad70f353b files/htmltidy-5.10.26-strip-O2-flag.patch 370
 MD5 7e13d83180df14aa9b50529973ded2ab htmltidy-3.10.29.ebuild 2521
+RMD160 cab06c55808dfdf56b34f2050085a3f4d46e47b9 htmltidy-3.10.29.ebuild 2521
+SHA256 de750133de2f083a35069c5f6fde04aa0e99b83560dfe9d7b46a29dbf8f77f04 htmltidy-3.10.29.ebuild 2521
 MD5 216e3bc36f28d37b90eac4d81399f337 htmltidy-4.8.6.ebuild 2527
+RMD160 912dd0267e7d843a19c72465b79e819cd895fa4a htmltidy-4.8.6.ebuild 2527
+SHA256 320f14c024655e36b007c6f7e14bc7c1ea59dd85a1f84414d441f20a685e3b1e htmltidy-4.8.6.ebuild 2527
+MD5 29ef8f73d6d8aaeea0946fa3ba777d51 htmltidy-5.10.26.ebuild 2513
+RMD160 82e5d6ff957f37e751617dd81817b6cf6f797e13 htmltidy-5.10.26.ebuild 2513
+SHA256 fd46834444803214ec4c62f9afa5a7a78f2d20cc4619a9995d993b76f7a20b2d htmltidy-5.10.26.ebuild 2513
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzjKg2+ySkm8kpY0RAjTFAJ41kNL6HrBdVashVN/pQFeWI83zowCgv9pO
-ZO+xEjxNKw090aTyvFp4kFU=
-=qNNY
------END PGP SIGNATURE-----
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
diff --git a/app-text/htmltidy/files/05-htmltidy-docbook.patch b/app-text/htmltidy/files/05-htmltidy-docbook.patch
new file mode 100644
index 000000000000..23c2ad468d7f
--- /dev/null
+++ b/app-text/htmltidy/files/05-htmltidy-docbook.patch
@@ -0,0 +1,99 @@
+diff -urN tidy.old/src/pprint.c tidy-26/src/pprint.c
+--- tidy.old/src/pprint.c	2005-08-03 08:58:11.000000000 +0200
++++ tidy-26/src/pprint.c	2006-02-13 17:29:01.000000000 +0100
+@@ -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 */
+@@ -708,7 +708,7 @@
+     }
+ }
+ 
+-static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
++void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
+ {
+     tmbchar entity[128];
+     ctmbstr p;
+@@ -943,7 +943,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;
+@@ -984,13 +984,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,
+@@ -1414,7 +1412,7 @@
+     AddChar( pprint, '>' );
+ }
+ 
+-static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
++void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
+ {
+     TidyPrintImpl* pprint = &doc->pprint;
+ 
+@@ -1501,7 +1499,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;
+@@ -1532,7 +1530,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;
+@@ -1620,7 +1618,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;
+@@ -1639,7 +1637,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 );
+@@ -1856,7 +1854,7 @@
+ 
+ 
+ 
+-static Bool ShouldIndent( TidyDocImpl* doc, Node *node )
++Bool ShouldIndent( TidyDocImpl* doc, Node *node )
+ {
+     TidyTriState indentContent = cfgAutoBool( doc, TidyIndentContent );
+     if ( indentContent == TidyNoState )
diff --git a/app-text/htmltidy/files/digest-htmltidy-5.10.26 b/app-text/htmltidy/files/digest-htmltidy-5.10.26
new file mode 100644
index 000000000000..9011943fc293
--- /dev/null
+++ b/app-text/htmltidy/files/digest-htmltidy-5.10.26
@@ -0,0 +1,9 @@
+MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
+RMD160 811a291e4824fa643d87aefafeddf5eaab728dda html2db.tar.gz 6028
+SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357 html2db.tar.gz 6028
+MD5 86de2f198e57399c063d2567b2a25628 tidy_docs_051020.tgz 150402
+RMD160 63f033560af9a53393d9a3f656f26bb12bf505b6 tidy_docs_051020.tgz 150402
+SHA256 8afdf165e7d5ce13cd64af4a5d0961627e006dbb3697fef97d378c94f052e35c tidy_docs_051020.tgz 150402
+MD5 1e39fafd6808978871346658c8da1454 tidy_src_051026.tgz 256131
+RMD160 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 tidy_src_051026.tgz 256131
+SHA256 538aadc6f06e988cca932bfecae00313063ce01e62f4d395cf84736fca41bbfd tidy_src_051026.tgz 256131
diff --git a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
new file mode 100644
index 000000000000..4c805cf2226f
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
@@ -0,0 +1,12 @@
+diff -urN tidy.old/configure.in tidy-26/configure.in
+--- tidy.old/configure.in	2006-02-13 17:17:49.000000000 +0100
++++ tidy-26/configure.in	2006-02-13 17:17:20.000000000 +0100
+@@ -72,7 +72,7 @@
+ if test $debug_build = yes; then
+ 	CFLAGS="$save_cflags -g"
+ else
+-	CFLAGS="-O2 $save_cflags"
++	CFLAGS="$save_cflags"
+ fi
+ # 
+ # =============================================
diff --git a/app-text/htmltidy/htmltidy-5.10.26.ebuild b/app-text/htmltidy/htmltidy-5.10.26.ebuild
new file mode 100644
index 000000000000..b7571b875629
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.10.26.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-5.10.26.ebuild,v 1.1 2006/02/13 17:38:10 ehmsen 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/${MY_P}.tgz
+	http://tidy.sourceforge.net/docs/tidy_docs_051020.tgz
+	xml? ( http://www.cise.ufl.edu/~ppadala/tidy/html2db.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug doc xml"
+
+DEPEND="virtual/libc
+	>=sys-devel/autoconf-2.5
+	>=sys-devel/automake-1.5"
+RDEPEND="virtual/libc"
+
+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
+	epatch ${FILESDIR}/htmltidy-5.10.26-strip-O2-flag.patch || die
+
+	if use xml ; then
+		# Apply the docbook patch to tidy sources
+		epatch ${FILESDIR}/05-${PN}-docbook.patch || die
+
+		# And the null -> NULL patch to html2db sources
+		EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/03-html2db-null.patch || die
+
+		# 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
+	#
+	# Update:
+	# Now the man page is provided as an xsl file, which
+	# we can't use until htmltidy is merged.
+	dodoc *.css *.xsl *.gif
+
+	# Install basic html documentation
+	dohtml *.html
+
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	use doc && dohtml -r api
+}