Added man page and quickref doc, bug #132429.

(Portage version: 2.1_pre10-r3)
 (Signed Manifest commit)

3 files changed, 37 insertions, 117 deletions

diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index b2599e32f49e..65ba55f63484 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,49 +1,67 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ebd0c4577332918cbf9f0ee88d97a355 ChangeLog 4456
-RMD160 7a3a9210a252bb3c0f6bad14be1c5a557c562ed6 ChangeLog 4456
-SHA256 d0e5b83ad23d19440a101be44ef6f26e5d6c4637781cd4258fe23fd66aa02a8f ChangeLog 4456
+AUX 03-html2db-null.patch 4249 RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 SHA1 b9d961e40225b8eed18c3e5bb6a8c1623382f495 SHA256 9a8544d4070d7794ae65a3b75cb398e37c447c3cd5ec5e89306fab765d85cbb5 size 4249
 MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
 RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 files/03-html2db-null.patch 4249
 SHA256 9a8544d4070d7794ae65a3b75cb398e37c447c3cd5ec5e89306fab765d85cbb5 files/03-html2db-null.patch 4249
+AUX 03-htmltidy-docbook.patch 2948 RMD160 75e14983a769f2a2cf06f1c8a4152af4b3ccfe77 SHA1 695850be86d67ff037e6ab205884390031bce5e9 SHA256 5279fcc00d26c35f7bbbac6e513cf4d3dcb71411da9dd76793b71c069eb3fde9 size 2948
 MD5 2fe7c73c1e39e2714ee35931b23b0b22 files/03-htmltidy-docbook.patch 2948
 RMD160 75e14983a769f2a2cf06f1c8a4152af4b3ccfe77 files/03-htmltidy-docbook.patch 2948
 SHA256 5279fcc00d26c35f7bbbac6e513cf4d3dcb71411da9dd76793b71c069eb3fde9 files/03-htmltidy-docbook.patch 2948
+AUX 04-htmltidy-docbook.patch 2975 RMD160 2f04472d478fc587546fab768c681ce93d4f0681 SHA1 832396516a98d048a9bb36a918dc2ae8e0ed2683 SHA256 ed90c549513c04a62da53f8bb72de131b1d08ac4fc0a74709f12820d8264a430 size 2975
 MD5 3e05bf3979c6a34b1b4166a2caee4024 files/04-htmltidy-docbook.patch 2975
 RMD160 2f04472d478fc587546fab768c681ce93d4f0681 files/04-htmltidy-docbook.patch 2975
 SHA256 ed90c549513c04a62da53f8bb72de131b1d08ac4fc0a74709f12820d8264a430 files/04-htmltidy-docbook.patch 2975
+AUX 05-htmltidy-docbook.patch 3039 RMD160 9afbf7e653db20d31bc0811c5e5c9ee3565356cb SHA1 9bb811de849f07ef03fe6937b0745d99928be925 SHA256 6b4f6562dc1e5e5425368e3bec533ae0e9866e2cf216b8c284d3f3fca706089f size 3039
 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
+AUX htmltidy-5.10.26-strip-O2-flag.patch 370 RMD160 1e531a13a61c80053cfb886a29cf2b4bafe45400 SHA1 f2b029ec14aede67b520c2376af27e594e9685dd SHA256 6acd356327faa4043a0b4cf5f242a5249d32c136fc39594701aca67ad70f353b size 370
 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
+DIST html2db.tar.gz 6028 RMD160 811a291e4824fa643d87aefafeddf5eaab728dda SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357 size 6028
+DIST htmltidy-5.10.26-doc.tar.bz2 12636 RMD160 f9123e37fd274afe9828a81d5edc2b7ac1a3afee SHA256 c51ffd8045eda8d63efc99fa690a3726cf7f68aa6241648bb3dc44d16ad03c18 size 12636
+DIST tidy_docs_040317.tgz 152421 size 152421
+DIST tidy_docs_040810.tgz 153044 RMD160 65f31c49074098e7bd071ef693bd9399693c17a9 SHA256 c9373469306b9bf40ddef297c1b36548edacf4d22766a5b7f4186c46c1d66302 size 153044
+DIST tidy_docs_051020.tgz 150402 RMD160 63f033560af9a53393d9a3f656f26bb12bf505b6 SHA256 8afdf165e7d5ce13cd64af4a5d0961627e006dbb3697fef97d378c94f052e35c size 150402
+DIST tidy_src_031029.tgz 239167 size 239167
+DIST tidy_src_040806.tgz 244076 size 244076
+DIST tidy_src_051026.tgz 256131 RMD160 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 SHA256 538aadc6f06e988cca932bfecae00313063ce01e62f4d395cf84736fca41bbfd size 256131
+EBUILD htmltidy-3.10.29.ebuild 2521 RMD160 cab06c55808dfdf56b34f2050085a3f4d46e47b9 SHA1 53bc63481ab76cae692465ea9acd8ed2eb4335f2 SHA256 de750133de2f083a35069c5f6fde04aa0e99b83560dfe9d7b46a29dbf8f77f04 size 2521
 MD5 7e13d83180df14aa9b50529973ded2ab htmltidy-3.10.29.ebuild 2521
 RMD160 cab06c55808dfdf56b34f2050085a3f4d46e47b9 htmltidy-3.10.29.ebuild 2521
 SHA256 de750133de2f083a35069c5f6fde04aa0e99b83560dfe9d7b46a29dbf8f77f04 htmltidy-3.10.29.ebuild 2521
+EBUILD htmltidy-4.8.6.ebuild 2527 RMD160 912dd0267e7d843a19c72465b79e819cd895fa4a SHA1 ef1711383895c79a11ef08f42a98e29771cd6e56 SHA256 320f14c024655e36b007c6f7e14bc7c1ea59dd85a1f84414d441f20a685e3b1e size 2527
 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 7fbd5b86c2b2fd4c4cc473c032fc7984 htmltidy-5.10.26.ebuild 2629
-RMD160 d396c9b74bbfd4552afd8d40ffa7d94ac8e663b2 htmltidy-5.10.26.ebuild 2629
-SHA256 dbbd8b2327d06d6a6f5ded224b4b47baf32115b3bff317982656e624600c75db htmltidy-5.10.26.ebuild 2629
+EBUILD htmltidy-5.10.26-r1.ebuild 2810 RMD160 66e7e7b004ce0e14e6812c53ca1b459f7f210868 SHA1 4c0d08ae79a18d99d64a72ccbac2c2923c3da025 SHA256 b1dfaa2bfbb19ec835f34edc923dac70068ff21c8beb269ccbd3a0298f12c064 size 2810
+MD5 b91832a65cf2da78742ebc599520ffa2 htmltidy-5.10.26-r1.ebuild 2810
+RMD160 66e7e7b004ce0e14e6812c53ca1b459f7f210868 htmltidy-5.10.26-r1.ebuild 2810
+SHA256 b1dfaa2bfbb19ec835f34edc923dac70068ff21c8beb269ccbd3a0298f12c064 htmltidy-5.10.26-r1.ebuild 2810
+MISC ChangeLog 4644 RMD160 6fbb789759b1e8a5e2e7be467f9e9d89bf7aa703 SHA1 370525903d8e5e3b74560c7596b799bc14ebf047 SHA256 e95528d2af638b36176ae66843ecbfa036019e293ff4fa35b36f1f76c465c686 size 4644
+MD5 97c43f87d9add8507a9b98048a90a49c ChangeLog 4644
+RMD160 6fbb789759b1e8a5e2e7be467f9e9d89bf7aa703 ChangeLog 4644
+SHA256 e95528d2af638b36176ae66843ecbfa036019e293ff4fa35b36f1f76c465c686 ChangeLog 4644
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 bd60de5f7781f578ca25a488e6b50e80 files/digest-htmltidy-3.10.29 346
+RMD160 3e5d6cb892714f1d43c4261fca982b147a21aac1 files/digest-htmltidy-3.10.29 346
+SHA256 c1a3032ad4d2cf7905e610f62f97e26e001ade58aa57fb3e5dd30eebb706e268 files/digest-htmltidy-3.10.29 346
+MD5 0f27533a60d7cef9c4c09b898e9ca75b files/digest-htmltidy-4.8.6 522
+RMD160 9983806800412f55dd106e9a496bbfdf02bcd7ca files/digest-htmltidy-4.8.6 522
+SHA256 6e1396fada1255f564182144a9afbdfba8daf5a13511df45f49ce1a895481224 files/digest-htmltidy-4.8.6 522
+MD5 376ac1494dab72e8c26d60ad58f7e19b files/digest-htmltidy-5.10.26-r1 958
+RMD160 5c4a1294941cb6d5f69940696a6c4b15294554c1 files/digest-htmltidy-5.10.26-r1 958
+SHA256 ed5a990333da9fc187d8082e1399bc0e2eb74baab3cabfd4c83e53fa05243de4 files/digest-htmltidy-5.10.26-r1 958
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFESq8fAiZjviIA2XgRAq7+AKCnaK6c3dPxVfO+ll+H/gvOgIMfAwCbBpNC
-iliJr5w/GanY0gGENI5GvoM=
-=js/g
+iD8DBQFEXwkYzxUa4FWw6mwRAodtAKClRYWOlLgjsbL9Za2Km2ABKWO3awCgq8U4
+ebK4O6Hp+1D+cl/fIwuMyIw=
+=YGv/
 -----END PGP SIGNATURE-----
diff --git a/app-text/htmltidy/files/digest-htmltidy-5.10.26 b/app-text/htmltidy/files/digest-htmltidy-5.10.26
deleted file mode 100644
index 9011943fc293..000000000000
--- a/app-text/htmltidy/files/digest-htmltidy-5.10.26
+++ /dev/null
@@ -1,9 +0,0 @@
-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/htmltidy-5.10.26.ebuild b/app-text/htmltidy/htmltidy-5.10.26.ebuild
deleted file mode 100644
index b3593ee8ff82..000000000000
--- a/app-text/htmltidy/htmltidy-5.10.26.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.2 2006/04/22 22:35:59 flameeyes 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 ~x86-fbsd"
-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
-}