Corrected autotools usage (bug #148759).

Package-Manager: portage-2.1.1

7 files changed, 163 insertions, 28 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index cc7da3d2d859..0977487f0cf8 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.33 2006/07/31 02:27:20 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.34 2006/09/23 17:41:07 nattfodd Exp $
+
+*htmltidy-5.10.26-r2 (23 Sep 2006)
+
+  23 Sep 2006; Alexandre Buisse <nattfodd@gentoo.org> htmltidy-4.8.6.ebuild,
+  +htmltidy-5.10.26-r2.ebuild:
+  Corrected autotools usage (bug #148759).
 
   30 Jul 2006; <psi29a@gentoo.org> htmltidy-4.8.6.ebuild:
   stable on mips
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 47a56da80b0d..8cd7a943ec6a 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 03-html2db-null.patch 4249 RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 SHA1 b9d961e40225b8eed18c3e5bb6a8c1623382f495 SHA256 9a8544d4070d7794ae65a3b75cb398e37c447c3cd5ec5e89306fab765d85cbb5
 MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
 RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 files/03-html2db-null.patch 4249
@@ -18,40 +21,54 @@ AUX htmltidy-5.10.26-strip-O2-flag.patch 370 RMD160 1e531a13a61c80053cfb886a29cf
 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
-DIST htmltidy-5.10.26-doc.tar.bz2 12636 RMD160 f9123e37fd274afe9828a81d5edc2b7ac1a3afee SHA256 c51ffd8045eda8d63efc99fa690a3726cf7f68aa6241648bb3dc44d16ad03c18
-DIST tidy_docs_040317.tgz 152421
-DIST tidy_docs_040810.tgz 153044 RMD160 65f31c49074098e7bd071ef693bd9399693c17a9 SHA256 c9373469306b9bf40ddef297c1b36548edacf4d22766a5b7f4186c46c1d66302
-DIST tidy_docs_051020.tgz 150402 RMD160 63f033560af9a53393d9a3f656f26bb12bf505b6 SHA256 8afdf165e7d5ce13cd64af4a5d0961627e006dbb3697fef97d378c94f052e35c
-DIST tidy_src_031029.tgz 239167
-DIST tidy_src_040806.tgz 244076
-DIST tidy_src_051026.tgz 256131 RMD160 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 SHA256 538aadc6f06e988cca932bfecae00313063ce01e62f4d395cf84736fca41bbfd
+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_docs_040317.tgz 152421 RMD160 7608fbcf1ff0bc092c15ada68a786e592db33545 SHA1 1c959cd61087992f64d0ad3fcecd4a215cf32453 SHA256 e0c281a9cedb67ed0cc0a7fdb6a1cafc24e33f946cbb44cea4db6be255e2950a
+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_031029.tgz 239167 RMD160 e250baa37609e019226c1e1ef03fb092ebe213b4 SHA1 8dbdd1d3c895044ad2a7e5fc8f708a35cfaf620e SHA256 79a59b2d512237733ab3f66c970e932ed83a4b720fa18d53b9f26e545452bde1
+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-3.10.29.ebuild 2521 RMD160 cab06c55808dfdf56b34f2050085a3f4d46e47b9 SHA1 53bc63481ab76cae692465ea9acd8ed2eb4335f2 SHA256 de750133de2f083a35069c5f6fde04aa0e99b83560dfe9d7b46a29dbf8f77f04
 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 2526 RMD160 8c03cd92c1b9aad22f96d746111ef7f6202100f0 SHA1 639c300b32771056dcaa6a5f2d6e23b3e66962f3 SHA256 980b489ff811acf0b3e71f9cda693e0e5da9651622fdac28a5675e131b6576a0
-MD5 8021fe18f5f873a2970793bcb121d2bd htmltidy-4.8.6.ebuild 2526
-RMD160 8c03cd92c1b9aad22f96d746111ef7f6202100f0 htmltidy-4.8.6.ebuild 2526
-SHA256 980b489ff811acf0b3e71f9cda693e0e5da9651622fdac28a5675e131b6576a0 htmltidy-4.8.6.ebuild 2526
+EBUILD htmltidy-4.8.6.ebuild 2523 RMD160 a427d86c14fdf96a81263314dc8133b1af3e0b36 SHA1 3cffe95135a3c3109ddecae4ba0193d921f9d5da SHA256 c73fd4e234c9a786ac4d81d4113aba9155ad5a08e64eaa02f49f5135001837d1
+MD5 4b30fe3653185396620cf0564a05414d htmltidy-4.8.6.ebuild 2523
+RMD160 a427d86c14fdf96a81263314dc8133b1af3e0b36 htmltidy-4.8.6.ebuild 2523
+SHA256 c73fd4e234c9a786ac4d81d4113aba9155ad5a08e64eaa02f49f5135001837d1 htmltidy-4.8.6.ebuild 2523
 EBUILD htmltidy-5.10.26-r1.ebuild 2810 RMD160 66e7e7b004ce0e14e6812c53ca1b459f7f210868 SHA1 4c0d08ae79a18d99d64a72ccbac2c2923c3da025 SHA256 b1dfaa2bfbb19ec835f34edc923dac70068ff21c8beb269ccbd3a0298f12c064
 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 4720 RMD160 a721b1d7f1efb0ea4e8618c8733a94252185ffa9 SHA1 bdf2fd0b25595c9fb58af306d80a7d11dc217a34 SHA256 a0c717698e1b5bb2e53c9fd283eeb0a7b30e043f6240e5235faab34b11212cd5
-MD5 b537e0215db64f94da09f3cca61e4edc ChangeLog 4720
-RMD160 a721b1d7f1efb0ea4e8618c8733a94252185ffa9 ChangeLog 4720
-SHA256 a0c717698e1b5bb2e53c9fd283eeb0a7b30e043f6240e5235faab34b11212cd5 ChangeLog 4720
+EBUILD htmltidy-5.10.26-r2.ebuild 2807 RMD160 cbb4f438f3be2cedab582b4f280a897cfef0fe4b SHA1 2a4766a5e2cebd797398b6280056d1b3322f854c SHA256 6bde2a7718860af14d8e18d6332170c43df9b463e70fa13f4378074422d6585e
+MD5 64eeb80ec9cae56abbd154eec91d8844 htmltidy-5.10.26-r2.ebuild 2807
+RMD160 cbb4f438f3be2cedab582b4f280a897cfef0fe4b htmltidy-5.10.26-r2.ebuild 2807
+SHA256 6bde2a7718860af14d8e18d6332170c43df9b463e70fa13f4378074422d6585e htmltidy-5.10.26-r2.ebuild 2807
+MISC ChangeLog 4910 RMD160 b7fa2c34214fc7f5d90b67271986a9c791478628 SHA1 b4c7f56e76bdbd15ad0ae8077b9751de9b9f3700 SHA256 961108d4715d65ba8ffb14608bc9a6addd8e2c16b3d63a6d15d87f1894b0b1c0
+MD5 8728de1e5b4c7e282fde60b1d92f1be8 ChangeLog 4910
+RMD160 b7fa2c34214fc7f5d90b67271986a9c791478628 ChangeLog 4910
+SHA256 961108d4715d65ba8ffb14608bc9a6addd8e2c16b3d63a6d15d87f1894b0b1c0 ChangeLog 4910
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 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 b50989efa4e35edf91ae28c7e7b2ac46 files/digest-htmltidy-3.10.29 696
+RMD160 b8bff08534174ae7eee0d5a3d2768164079b5f11 files/digest-htmltidy-3.10.29 696
+SHA256 eac0922336992960a69cba2c1a4e320cb1286872f4b3e23cdd1ce91442f35852 files/digest-htmltidy-3.10.29 696
+MD5 94399928cd568da443308c33c8e9d827 files/digest-htmltidy-4.8.6 696
+RMD160 fb86ba073bf55f9e279f233500cc7c95cdf76d0c files/digest-htmltidy-4.8.6 696
+SHA256 204b24f56c35858695745ef79d135af1a42059df14d3d5ec73543d0042967420 files/digest-htmltidy-4.8.6 696
 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
+MD5 376ac1494dab72e8c26d60ad58f7e19b files/digest-htmltidy-5.10.26-r2 958
+RMD160 5c4a1294941cb6d5f69940696a6c4b15294554c1 files/digest-htmltidy-5.10.26-r2 958
+SHA256 ed5a990333da9fc187d8082e1399bc0e2eb74baab3cabfd4c83e53fa05243de4 files/digest-htmltidy-5.10.26-r2 958
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFXI9wx9vvAARv2sRAt3BAJsF7J9JjnmJBET8npXTLOCUw7JsDACdGjb2
+2WXbqbzt3t9kKUCCynVIYhs=
+=EFmc
+-----END PGP SIGNATURE-----
diff --git a/app-text/htmltidy/files/digest-htmltidy-3.10.29 b/app-text/htmltidy/files/digest-htmltidy-3.10.29
index 90d2af740333..98c7a8dcf8ed 100644
--- a/app-text/htmltidy/files/digest-htmltidy-3.10.29
+++ b/app-text/htmltidy/files/digest-htmltidy-3.10.29
@@ -2,4 +2,8 @@ MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
 RMD160 811a291e4824fa643d87aefafeddf5eaab728dda html2db.tar.gz 6028
 SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357 html2db.tar.gz 6028
 MD5 ec60e9c63ed5d98cbdf98260a9a03c23 tidy_docs_040317.tgz 152421
+RMD160 7608fbcf1ff0bc092c15ada68a786e592db33545 tidy_docs_040317.tgz 152421
+SHA256 e0c281a9cedb67ed0cc0a7fdb6a1cafc24e33f946cbb44cea4db6be255e2950a tidy_docs_040317.tgz 152421
 MD5 bb81e507333c019bc56fa7c3d1a6ef3b tidy_src_031029.tgz 239167
+RMD160 e250baa37609e019226c1e1ef03fb092ebe213b4 tidy_src_031029.tgz 239167
+SHA256 79a59b2d512237733ab3f66c970e932ed83a4b720fa18d53b9f26e545452bde1 tidy_src_031029.tgz 239167
diff --git a/app-text/htmltidy/files/digest-htmltidy-4.8.6 b/app-text/htmltidy/files/digest-htmltidy-4.8.6
index 7c09f272abbb..23b3252a265b 100644
--- a/app-text/htmltidy/files/digest-htmltidy-4.8.6
+++ b/app-text/htmltidy/files/digest-htmltidy-4.8.6
@@ -5,3 +5,5 @@ MD5 04338149bdd3e10753101bc5dff8acd8 tidy_docs_040810.tgz 153044
 RMD160 65f31c49074098e7bd071ef693bd9399693c17a9 tidy_docs_040810.tgz 153044
 SHA256 c9373469306b9bf40ddef297c1b36548edacf4d22766a5b7f4186c46c1d66302 tidy_docs_040810.tgz 153044
 MD5 3a19c40fbd96fd6f6783668a1e6c59d6 tidy_src_040806.tgz 244076
+RMD160 5cff3fe361d9d9fe9d789d8d087b90efba0546f4 tidy_src_040806.tgz 244076
+SHA256 1158e148ce6e1749baf46cc422e53609b8c7a0423a0e03d14911cc13d031bd3e tidy_src_040806.tgz 244076
diff --git a/app-text/htmltidy/files/digest-htmltidy-5.10.26-r2 b/app-text/htmltidy/files/digest-htmltidy-5.10.26-r2
new file mode 100644
index 000000000000..c6926c832c5b
--- /dev/null
+++ b/app-text/htmltidy/files/digest-htmltidy-5.10.26-r2
@@ -0,0 +1,12 @@
+MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
+RMD160 811a291e4824fa643d87aefafeddf5eaab728dda html2db.tar.gz 6028
+SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357 html2db.tar.gz 6028
+MD5 0260365a0dc6809d237199d59a5c392e htmltidy-5.10.26-doc.tar.bz2 12636
+RMD160 f9123e37fd274afe9828a81d5edc2b7ac1a3afee htmltidy-5.10.26-doc.tar.bz2 12636
+SHA256 c51ffd8045eda8d63efc99fa690a3726cf7f68aa6241648bb3dc44d16ad03c18 htmltidy-5.10.26-doc.tar.bz2 12636
+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-4.8.6.ebuild b/app-text/htmltidy/htmltidy-4.8.6.ebuild
index f1db4dce7ab4..815b83483888 100644
--- a/app-text/htmltidy/htmltidy-4.8.6.ebuild
+++ b/app-text/htmltidy/htmltidy-4.8.6.ebuild
@@ -1,8 +1,11 @@
 # 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-4.8.6.ebuild,v 1.19 2006/07/31 02:27:20 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-4.8.6.ebuild,v 1.20 2006/09/23 17:41:07 nattfodd Exp $
 
-inherit eutils
+WANT_AUTOMAKE=1.5
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
 
 # Convert gentoo version number x.y.z to date xyz for
 # tidy's source numbering by date
@@ -22,9 +25,7 @@ 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"
+DEPEND="virtual/libc"
 RDEPEND="virtual/libc"
 
 src_unpack() {
diff --git a/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
new file mode 100644
index 000000000000..38630188ee8d
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
@@ -0,0 +1,93 @@
+# 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-r2.ebuild,v 1.1 2006/09/23 17:41:07 nattfodd Exp $
+
+WANT_AUTOMAKE=1.5
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
+
+# 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
+	mirror://gentoo/${P}-doc.tar.bz2
+	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"
+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.
+	# I have generated the man page and quickref which is on
+	# the mirrors. (bug #132429)
+	doman "${WORKDIR}/${P}-doc/tidy.1"
+
+	# Install basic html documentation
+	dohtml *.html *.css *.gif "${WORKDIR}/${P}-doc/quickref.html"
+
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	use doc && dohtml -r api
+}