Version bump to latest CVS sources. Remove xml use flag and html2db as it was never integrated upstream and does not compile due to usage of internal tidy API. Enable /etc/tidyrc and ~/.tidyrc config paths and build autotools properly, closes bugs 154834, 219450, 226437 and 278604.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 130 insertions, 11 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index 0755fa834f3d..445dec25137e 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/htmltidy
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.44 2007/05/30 16:33:34 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.45 2009/07/22 17:28:23 rbu Exp $
+
+*htmltidy-20090325 (22 Jul 2009)
+
+  22 Jul 2009; Robert Buchholz <rbu@gentoo.org>
+  +files/htmltidy-20090325-tidyrc.patch, htmltidy-4.8.6.ebuild,
+  htmltidy-5.10.26-r2.ebuild, +htmltidy-20090325.ebuild:
+  Version bump to latest CVS sources. Remove xml use flag and html2db as it was
+  never integrated upstream and does not compile due to usage of internal tidy
+  API. Enable /etc/tidyrc and ~/.tidyrc config paths and build autotools
+  properly, closes bugs 154834, 219450, 226437 and 278604.
 
   30 May 2007; Raúl Porcel <armin76@gentoo.org> htmltidy-5.10.26-r2.ebuild:
   alpha stable wrt #155327
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 6968e7d40532..6772bc108111 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -2,14 +2,18 @@ AUX 03-html2db-null.patch 4249 RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 S
 AUX 03-htmltidy-docbook.patch 2948 RMD160 75e14983a769f2a2cf06f1c8a4152af4b3ccfe77 SHA1 695850be86d67ff037e6ab205884390031bce5e9 SHA256 5279fcc00d26c35f7bbbac6e513cf4d3dcb71411da9dd76793b71c069eb3fde9
 AUX 04-htmltidy-docbook.patch 2975 RMD160 2f04472d478fc587546fab768c681ce93d4f0681 SHA1 832396516a98d048a9bb36a918dc2ae8e0ed2683 SHA256 ed90c549513c04a62da53f8bb72de131b1d08ac4fc0a74709f12820d8264a430
 AUX 05-htmltidy-docbook.patch 3039 RMD160 9afbf7e653db20d31bc0811c5e5c9ee3565356cb SHA1 9bb811de849f07ef03fe6937b0745d99928be925 SHA256 6b4f6562dc1e5e5425368e3bec533ae0e9866e2cf216b8c284d3f3fca706089f
+AUX htmltidy-20090325-tidyrc.patch 923 RMD160 654fd948c82558e4620b684a960c65e68a87731a SHA1 68767808ad40ab60470340acc5cad50b41a9f0b7 SHA256 2953cab71d0363b3c53798e8405cef560a2026a4f4a044a9b21def11ab682811
 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 RMD160 1e531a13a61c80053cfb886a29cf2b4bafe45400 SHA1 f2b029ec14aede67b520c2376af27e594e9685dd SHA256 6acd356327faa4043a0b4cf5f242a5249d32c136fc39594701aca67ad70f353b
 DIST html2db.tar.gz 6028 RMD160 811a291e4824fa643d87aefafeddf5eaab728dda SHA1 75084557e670e6c7a2327072766b9effba614cd5 SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357
 DIST htmltidy-5.10.26-doc.tar.bz2 12636 RMD160 f9123e37fd274afe9828a81d5edc2b7ac1a3afee SHA1 4f3d748bae6879e051379d79b52a3ad9c7a2c1d0 SHA256 c51ffd8045eda8d63efc99fa690a3726cf7f68aa6241648bb3dc44d16ad03c18
+DIST tidy-20090325-doc.tar.bz2 13319 RMD160 8fee995d8eb385e87ec9a3fcd27b9a18abc4beaf SHA1 72ec377341a50369beffae2ab4a2a75b26d65798 SHA256 be018829d24d5477556f3b72a426335ca21f62ca103b50a5d17c0e16ffd97956
+DIST tidy-20090325.tar.bz2 382016 RMD160 796a025bc1b67ea64394c64a1455a582e9285982 SHA1 28c000a2cd40262fc0d7c2c429eb2a09b2df7bf4 SHA256 58099898f326eff209a97509d1879cee19812a8a7048e2143b39821d35d7b6bd
 DIST tidy_docs_040810.tgz 153044 RMD160 65f31c49074098e7bd071ef693bd9399693c17a9 SHA1 c8665ede43f58d1b4dad5921f0b520ec863eb416 SHA256 c9373469306b9bf40ddef297c1b36548edacf4d22766a5b7f4186c46c1d66302
 DIST tidy_docs_051020.tgz 150402 RMD160 63f033560af9a53393d9a3f656f26bb12bf505b6 SHA1 04988d51267566db6899e8061d9f2e5b58fbeec4 SHA256 8afdf165e7d5ce13cd64af4a5d0961627e006dbb3697fef97d378c94f052e35c
 DIST tidy_src_040806.tgz 244076 RMD160 5cff3fe361d9d9fe9d789d8d087b90efba0546f4 SHA1 477bcdb7b3b75281e41580e962e3f939d9eba8fa SHA256 1158e148ce6e1749baf46cc422e53609b8c7a0423a0e03d14911cc13d031bd3e
 DIST tidy_src_051026.tgz 256131 RMD160 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 SHA1 53be36945344af0c4080c34ebc95728bf8617f1c SHA256 538aadc6f06e988cca932bfecae00313063ce01e62f4d395cf84736fca41bbfd
-EBUILD htmltidy-4.8.6.ebuild 2513 RMD160 858dbcdebd82252fcdc0d8be732e7db75e016f06 SHA1 43112c6cdfee2a35f54c54108d27a0a0a229fb04 SHA256 2166bc63eb59970cbe594464263e3c749df6cb7120f7eb10107ec0e7b461d250
-EBUILD htmltidy-5.10.26-r2.ebuild 2752 RMD160 1851ed267050a65a3ddc87f4006819b7712a62ea SHA1 4bb17a6d6350a6e4766406221ac54c0b0764a893 SHA256 e8d7b464edbb8f237590e667d980fcd6cc7876f75198beac822ef7779704a975
-MISC ChangeLog 6127 RMD160 a0cf042c725ef43f05d8c316b4b652cc151fa887 SHA1 75a3e55a4f0718476ef74d2eaeb4a5591543fcb8 SHA256 cbfdce2a451007ee828d3a32de1159b922e2421a0bd3ffb765739dfa6f0b97c4
+EBUILD htmltidy-20090325.ebuild 2024 RMD160 6c920e597fd866d59805eb161fa48542357fa1a5 SHA1 c56dc0d1ee33d6ef342f2b68caf97cec8e78c77d SHA256 0311655e89203a00ec1980c44f8de939b4e65641bfa6b0c260a5bea5cf2b9664
+EBUILD htmltidy-4.8.6.ebuild 2518 RMD160 855770269fb980192ae37f0d3182825c6c5e0caa SHA1 6607f7e95c0bca39884d2b7830a30369b84753ad SHA256 d4d55a79451a1b41e68dd0e97fbcaacaeeefe2faced5afa3fabd72f7663e9cb6
+EBUILD htmltidy-5.10.26-r2.ebuild 2757 RMD160 a3e2e2923a6669f5b6fc097b061cdab17f3d7a79 SHA1 7e2de87d26a6d827ef2502f0e24af0e83e3dbf1f SHA256 855ae61a03b87db534952985c08d99727a6ad9b929e4fda437d371290caa689e
+MISC ChangeLog 6618 RMD160 d649eb8d9e71c71959df54668da8c3980ddecacf SHA1 6fc4b262933d3f26c0ff244c0b680e5a368f8d03 SHA256 9191228cb68597e11765df74659a9e43be006a6fb6d4efa5dac229410f213632
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
diff --git a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch b/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
new file mode 100644
index 000000000000..942a61e1464c
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
@@ -0,0 +1,31 @@
+Index: tidy-20090325/include/platform.h
+===================================================================
+--- tidy-20090325.orig/include/platform.h
++++ tidy-20090325/include/platform.h
+@@ -24,7 +24,7 @@ extern "C" {
+ */
+ 
+ /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
+-/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
++#define TIDY_CONFIG_FILE "/etc/tidyrc"
+ /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
+ 
+ /*
+@@ -33,7 +33,7 @@ extern "C" {
+   It enables tidy to find config files named ~/.tidyrc if 
+   the HTML_TIDY environment variable is not set.
+ */
+-/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
++#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
+ 
+ /*
+   Uncomment the following #define if your
+@@ -48,7 +48,7 @@ extern "C" {
+   Contributed by Todd Lewis.
+ */
+ 
+-/* #define SUPPORT_GETPWNAM */
++#define SUPPORT_GETPWNAM
+ 
+ 
+ /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/app-text/htmltidy/htmltidy-20090325.ebuild b/app-text/htmltidy/htmltidy-20090325.ebuild
new file mode 100644
index 000000000000..0680714bfdad
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-20090325.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-20090325.ebuild,v 1.1 2009/07/22 17:28:23 rbu Exp $
+
+EAPI=2
+inherit eutils autotools
+
+MY_PN="tidy"
+MY_P=${MY_PN}-${PV}
+S="${WORKDIR}"/${MY_P}
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="http://tidy.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-doc.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	# Required to setup the source dist for autotools
+	einfo "Setting up autotools for source build"
+	cp -R  ./build/gnuauto/* . || die "could not prepare autotools environment"
+
+	# Stop tidy from appending -O2 to our CFLAGS
+	epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch
+
+	# Define /etc/tidyrc for system wide config, bug 154834
+	epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		doxygen htmldoc/doxygen.cfg  || die "error making apidocs"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "error during make install"
+
+	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.
+	# I have generated the man page and quickref which is on
+	# the mirrors. (bug #132429)
+	doman "${WORKDIR}"/${MY_P}-doc/tidy.1
+
+	# Install basic html documentation
+	dohtml *.html *.css *.gif "${WORKDIR}"/${MY_P}-doc/quickref.html
+
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	use doc && dohtml -r api
+}
diff --git a/app-text/htmltidy/htmltidy-4.8.6.ebuild b/app-text/htmltidy/htmltidy-4.8.6.ebuild
index d1046756d6b5..8dc8dfeb60aa 100644
--- a/app-text/htmltidy/htmltidy-4.8.6.ebuild
+++ b/app-text/htmltidy/htmltidy-4.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.22 2007/06/26 01:44:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-4.8.6.ebuild,v 1.23 2009/07/22 17:28:23 rbu Exp $
 
 WANT_AUTOMAKE=1.5
 WANT_AUTOCONF=2.5
@@ -18,7 +18,7 @@ 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_040810.tgz
-	xml? ( http://www.cise.ufl.edu/~ppadala/tidy/html2db.tar.gz )"
+	xml? ( http://www.eecs.umich.edu/~ppadala/projects/tidy/html2db.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
index f226dd4e1ff7..215355199c5c 100644
--- a/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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-r2.ebuild,v 1.12 2007/06/26 01:44:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild,v 1.13 2009/07/22 17:28:23 rbu Exp $
 
 WANT_AUTOMAKE=1.5
 WANT_AUTOCONF=2.5
@@ -19,7 +19,7 @@ HOMEPAGE="http://tidy.sourceforge.net/"
 SRC_URI="http://tidy.sourceforge.net/src/${MY_P}.tgz
 	http://tidy.sourceforge.net/docs/tidy_docs_051020.tgz
 	mirror://gentoo/${P}-doc.tar.bz2
-	xml? ( http://www.cise.ufl.edu/~ppadala/tidy/html2db.tar.gz )"
+	xml? ( http://www.eecs.umich.edu/~ppadala/projects/tidy/html2db.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"