use java-pkg_dohtml instead of dohtml to also install the package-list in case of api docs: #50740

39 files changed, 141 insertions, 64 deletions

diff --git a/dev-java/sun-jaf-bin/ChangeLog b/dev-java/sun-jaf-bin/ChangeLog
index 732df539335f..e624046bc521 100644
--- a/dev-java/sun-jaf-bin/ChangeLog
+++ b/dev-java/sun-jaf-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jaf-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jaf-bin/ChangeLog,v 1.5 2004/09/27 14:58:57 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jaf-bin/ChangeLog,v 1.6 2004/10/16 17:37:43 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> sun-jaf-bin-1.0.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Sep 2004; <SeJo@gentoo.org> :
   digest wrong
diff --git a/dev-java/sun-jaf-bin/sun-jaf-bin-1.0.2.ebuild b/dev-java/sun-jaf-bin/sun-jaf-bin-1.0.2.ebuild
index bacbbe6d1e7a..57df898c8ab5 100644
--- a/dev-java/sun-jaf-bin/sun-jaf-bin-1.0.2.ebuild
+++ b/dev-java/sun-jaf-bin/sun-jaf-bin-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jaf-bin/sun-jaf-bin-1.0.2.ebuild,v 1.4 2004/07/14 13:18:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jaf-bin/sun-jaf-bin-1.0.2.ebuild,v 1.5 2004/10/16 17:37:43 axxo Exp $
 
 inherit java-pkg
 
@@ -54,6 +54,6 @@ src_compile() {
 
 src_install() {
 	dodoc RELNOTES.txt README.txt LICENSE.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 	java-pkg_dojar activation.jar
 }
diff --git a/dev-java/sun-javamail-bin/ChangeLog b/dev-java/sun-javamail-bin/ChangeLog
index ff65c5148309..d47c44ee8450 100644
--- a/dev-java/sun-javamail-bin/ChangeLog
+++ b/dev-java/sun-javamail-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-javamail-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail-bin/ChangeLog,v 1.5 2004/06/24 22:43:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail-bin/ChangeLog,v 1.6 2004/10/16 17:38:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  sun-javamail-bin-1.3.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   13 May 2004; Chris Aniszczyk <zx@gentoo.org> :
   Thanks to roninds <dstanek@dstanek.com> for the heads up
diff --git a/dev-java/sun-javamail-bin/sun-javamail-bin-1.3.1.ebuild b/dev-java/sun-javamail-bin/sun-javamail-bin-1.3.1.ebuild
index 58d582bf2382..a065d3cad480 100644
--- a/dev-java/sun-javamail-bin/sun-javamail-bin-1.3.1.ebuild
+++ b/dev-java/sun-javamail-bin/sun-javamail-bin-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail-bin/sun-javamail-bin-1.3.1.ebuild,v 1.3 2004/06/24 22:43:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail-bin/sun-javamail-bin-1.3.1.ebuild,v 1.4 2004/10/16 17:38:03 axxo Exp $
 
 inherit java-pkg
 
@@ -55,6 +55,6 @@ src_compile() {
 
 src_install() {
 	dodoc CHANGES.txt README.txt LICENSE.txt NOTES.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 	java-pkg_dojar mail.jar lib/*.jar
 }
diff --git a/dev-java/tagsoup/ChangeLog b/dev-java/tagsoup/ChangeLog
index 8ace4bdd9715..c669cefabf19 100644
--- a/dev-java/tagsoup/ChangeLog
+++ b/dev-java/tagsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tagsoup
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/ChangeLog,v 1.1 2004/09/19 15:08:22 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/ChangeLog,v 1.2 2004/10/16 17:38:21 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> tagsoup-0.10.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *tagsoup-0.10.2 (19 Sep 2004)
 
diff --git a/dev-java/tagsoup/tagsoup-0.10.2.ebuild b/dev-java/tagsoup/tagsoup-0.10.2.ebuild
index 2da25b40e0f7..ee2766205158 100644
--- a/dev-java/tagsoup/tagsoup-0.10.2.ebuild
+++ b/dev-java/tagsoup/tagsoup-0.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/tagsoup-0.10.2.ebuild,v 1.1 2004/09/19 15:08:22 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/tagsoup-0.10.2.ebuild,v 1.2 2004/10/16 17:38:21 axxo Exp $
 
 inherit java-pkg
 
@@ -29,5 +29,5 @@ src_install() {
 	java-pkg_dojar dist/lib/${PN}.jar
 
 	dodoc CHANGES LICENSE README TODO
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/tagunit/ChangeLog b/dev-java/tagunit/ChangeLog
index 543b62c4740b..861c778b60e0 100644
--- a/dev-java/tagunit/ChangeLog
+++ b/dev-java/tagunit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tagunit
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/ChangeLog,v 1.2 2004/06/24 22:44:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/ChangeLog,v 1.3 2004/10/16 17:38:40 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> tagunit-1.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *tagunit-1.0.1 (04 Apr 2004)
 
diff --git a/dev-java/tagunit/tagunit-1.0.1.ebuild b/dev-java/tagunit/tagunit-1.0.1.ebuild
index cf1bf7c46b98..6412ed46222b 100644
--- a/dev-java/tagunit/tagunit-1.0.1.ebuild
+++ b/dev-java/tagunit/tagunit-1.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/tagunit-1.0.1.ebuild,v 1.2 2004/06/24 22:44:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/tagunit-1.0.1.ebuild,v 1.3 2004/10/16 17:38:40 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="TagUnit is a tag library for testing custom tags within JSP pages."
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-src.zip"
@@ -30,5 +32,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/${PN}.jar
 	dodoc changes.txt readme.txt
-	use doc && dohtml -r doc/api/*
+	use doc && java-pkg_dohtml -r doc/api/*
 }
diff --git a/dev-java/telnetd/ChangeLog b/dev-java/telnetd/ChangeLog
index d7687a7e7ce6..31f1941e97b0 100644
--- a/dev-java/telnetd/ChangeLog
+++ b/dev-java/telnetd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/telnetd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/ChangeLog,v 1.3 2004/09/19 21:37:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/ChangeLog,v 1.4 2004/10/16 17:38:59 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> telnetd-1.0-r1.ebuild,
+  telnetd-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *telnetd-1.0-r1 (19 Sep 2004)
 
diff --git a/dev-java/telnetd/telnetd-1.0-r1.ebuild b/dev-java/telnetd/telnetd-1.0-r1.ebuild
index 379a821874e7..9d10d31b2000 100644
--- a/dev-java/telnetd/telnetd-1.0-r1.ebuild
+++ b/dev-java/telnetd/telnetd-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/telnetd-1.0-r1.ebuild,v 1.1 2004/09/19 21:37:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/telnetd-1.0-r1.ebuild,v 1.2 2004/10/16 17:38:59 axxo Exp $
 
 inherit java-pkg
 
@@ -33,5 +33,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar build/telnetd.jar
-	use doc && dohtml -r build/site/api/*
+	use doc && java-pkg_dohtml -r build/site/api/*
 }
diff --git a/dev-java/telnetd/telnetd-1.0.ebuild b/dev-java/telnetd/telnetd-1.0.ebuild
index 240f5fb4ce91..7de80ccf4198 100644
--- a/dev-java/telnetd/telnetd-1.0.ebuild
+++ b/dev-java/telnetd/telnetd-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/telnetd-1.0.ebuild,v 1.2 2004/08/30 23:36:46 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/telnetd-1.0.ebuild,v 1.3 2004/10/16 17:38:59 axxo Exp $
 
 inherit java-pkg
 
@@ -25,5 +25,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar build/telnetd.jar
-	use doc && dohtml -r build/site/api/*
+	use doc && java-pkg_dohtml -r build/site/api/*
 }
diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 8dfc48efac82..bc8baf90e2fa 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/velocity
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.13 2004/08/23 21:57:36 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.14 2004/10/16 17:39:18 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> velocity-1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> -velocity-1.3.ebuild,
   velocity-1.4.ebuild:
diff --git a/dev-java/velocity/velocity-1.4.ebuild b/dev-java/velocity/velocity-1.4.ebuild
index 41132e634404..2ff0e5c2fb28 100644
--- a/dev-java/velocity/velocity-1.4.ebuild
+++ b/dev-java/velocity/velocity-1.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4.ebuild,v 1.5 2004/08/23 21:57:36 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4.ebuild,v 1.6 2004/10/16 17:39:18 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
 HOMEPAGE="http://jakarta.apache.org/velocity/"
@@ -37,10 +39,10 @@ src_compile () {
 src_install () {
 	cd ${S}
 	if use j2ee ; then
-		dojar bin/${PN}-J2EE-${PV}.jar
+		java-pkg_dojar bin/${PN}-J2EE-${PV}.jar
 	else
-		dojar bin/${PN}-${PV}.jar
+		java-pkg_dojar bin/${PN}-${PV}.jar
 	fi
 	dodoc LICENSE NOTICE README.txt
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/violinstrings/ChangeLog b/dev-java/violinstrings/ChangeLog
index 615988264af7..60f06180e1cb 100644
--- a/dev-java/violinstrings/ChangeLog
+++ b/dev-java/violinstrings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/violinstrings
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/violinstrings/ChangeLog,v 1.4 2004/08/03 11:23:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/violinstrings/ChangeLog,v 1.5 2004/10/16 17:39:37 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> violinstrings-1.0.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   03 Aug 2004; David Holm <dholm@gentoo.org> violinstrings-1.0.2.ebuild:
   Added to ~ppc.
diff --git a/dev-java/violinstrings/violinstrings-1.0.2.ebuild b/dev-java/violinstrings/violinstrings-1.0.2.ebuild
index 352a7764e5df..434a09229528 100644
--- a/dev-java/violinstrings/violinstrings-1.0.2.ebuild
+++ b/dev-java/violinstrings/violinstrings-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/violinstrings/violinstrings-1.0.2.ebuild,v 1.5 2004/08/03 11:23:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/violinstrings/violinstrings-1.0.2.ebuild,v 1.6 2004/10/16 17:39:37 axxo Exp $
 
 inherit java-pkg
 
@@ -24,6 +24,6 @@ src_compile() {
 src_install() {
 	java-pkg_dojar *.jar
 	dodoc CHANGES
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/webgraph-bin/ChangeLog b/dev-java/webgraph-bin/ChangeLog
index 0ab21fec73f3..6f1dcf978558 100644
--- a/dev-java/webgraph-bin/ChangeLog
+++ b/dev-java/webgraph-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/webgraph-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph-bin/ChangeLog,v 1.4 2004/09/05 07:21:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph-bin/ChangeLog,v 1.5 2004/10/16 17:39:56 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  webgraph-bin-1.2.2-r1.ebuild, webgraph-bin-1.2.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/webgraph-bin/webgraph-bin-1.2.2-r1.ebuild b/dev-java/webgraph-bin/webgraph-bin-1.2.2-r1.ebuild
index 5f70409bd99d..bfb7e9a3d033 100644
--- a/dev-java/webgraph-bin/webgraph-bin-1.2.2-r1.ebuild
+++ b/dev-java/webgraph-bin/webgraph-bin-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph-bin/webgraph-bin-1.2.2-r1.ebuild,v 1.1 2004/08/21 12:06:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph-bin/webgraph-bin-1.2.2-r1.ebuild,v 1.2 2004/10/16 17:39:56 axxo Exp $
 
 inherit java-pkg
 
@@ -22,6 +22,6 @@ src_compile() { :; }
 src_install() {
 	mv ${MY_P}.jar ${PN/-bin}.jar
 	java-pkg_dojar ${PN/-bin}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/webgraph-bin/webgraph-bin-1.2.2.ebuild b/dev-java/webgraph-bin/webgraph-bin-1.2.2.ebuild
index 13544f97ff81..1597d6178e39 100644
--- a/dev-java/webgraph-bin/webgraph-bin-1.2.2.ebuild
+++ b/dev-java/webgraph-bin/webgraph-bin-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph-bin/webgraph-bin-1.2.2.ebuild,v 1.2 2004/08/03 12:07:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph-bin/webgraph-bin-1.2.2.ebuild,v 1.3 2004/10/16 17:39:56 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ src_compile() { :; }
 src_install() {
 	mv ${P/-bin}.jar ${PN/-bin}.jar
 	java-pkg_dojar ${PN/-bin}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/wsdl4j-bin/ChangeLog b/dev-java/wsdl4j-bin/ChangeLog
index 5bb62fa83ffc..83bf98f9a276 100644
--- a/dev-java/wsdl4j-bin/ChangeLog
+++ b/dev-java/wsdl4j-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/wsdl4j-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j-bin/ChangeLog,v 1.2 2004/09/05 07:22:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j-bin/ChangeLog,v 1.3 2004/10/16 17:40:15 axxo Exp $
+
+*wsdl4j-bin-1.4 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> wsdl4j-bin-1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/wsdl4j-bin/wsdl4j-bin-1.4.ebuild b/dev-java/wsdl4j-bin/wsdl4j-bin-1.4.ebuild
index 7c6f25d765b5..93bc659f8d5a 100644
--- a/dev-java/wsdl4j-bin/wsdl4j-bin-1.4.ebuild
+++ b/dev-java/wsdl4j-bin/wsdl4j-bin-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j-bin/wsdl4j-bin-1.4.ebuild,v 1.1 2004/07/30 22:00:50 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j-bin/wsdl4j-bin-1.4.ebuild,v 1.2 2004/10/16 17:40:15 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ S="${WORKDIR}/${PN/-bin}-${PV//./_}"
 src_compile() { :; }
 
 src_install() {
-	dohtml -r docs/
+	java-pkg_dohtml -r docs/
 	java-pkg_dojar lib/qname.jar lib/wsdl4j.jar
 }
diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index 8c7024b03660..2028353a2c54 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.27 2004/10/04 08:00:25 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.28 2004/10/16 17:40:36 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xalan-2.5.2.ebuild,
+  xalan-2.6.0-r1.ebuild, xalan-2.6.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   04 Oct 2004; <SeJo@gentoo.org> xalan-2.6.0.ebuild:
   stable on ppc
diff --git a/dev-java/xalan/xalan-2.5.2.ebuild b/dev-java/xalan/xalan-2.5.2.ebuild
index fca264f9fd2f..491e30b6c0af 100644
--- a/dev-java/xalan/xalan-2.5.2.ebuild
+++ b/dev-java/xalan/xalan-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.2.ebuild,v 1.7 2004/09/10 19:51:04 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.2.ebuild,v 1.8 2004/10/16 17:40:36 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -51,7 +51,7 @@ src_install () {
 	if use doc ; then
 		dodir /usr/share/doc/${P}
 		dodoc TODO STATUS README LICENSE ISSUES
-		dohtml -r build/docs/*
+		java-pkg_dohtml -r build/docs/*
 	fi
 }
 
diff --git a/dev-java/xalan/xalan-2.6.0-r1.ebuild b/dev-java/xalan/xalan-2.6.0-r1.ebuild
index 4aa73cd240bd..63c02cf6d67e 100644
--- a/dev-java/xalan/xalan-2.6.0-r1.ebuild
+++ b/dev-java/xalan/xalan-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r1.ebuild,v 1.3 2004/09/28 22:03:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r1.ebuild,v 1.4 2004/10/16 17:40:36 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -47,5 +47,5 @@ src_compile() {
 
 src_install () {
 	java-pkg_dojar build/xalan.jar
-	use doc && dohtml -r ${WORKDIR}/docs/*
+	use doc && java-pkg_dohtml -r ${WORKDIR}/docs/*
 }
diff --git a/dev-java/xalan/xalan-2.6.0.ebuild b/dev-java/xalan/xalan-2.6.0.ebuild
index e250bf5445a7..d0961f74559e 100644
--- a/dev-java/xalan/xalan-2.6.0.ebuild
+++ b/dev-java/xalan/xalan-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0.ebuild,v 1.7 2004/10/04 08:00:25 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0.ebuild,v 1.8 2004/10/16 17:40:36 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -50,7 +50,7 @@ src_install () {
 	if use doc ; then
 		dodir /usr/share/doc/${P}
 		dodoc TODO STATUS README LICENSE ISSUES
-		dohtml -r build/docs/*
+		java-pkg_dohtml -r build/docs/*
 	fi
 }
 
diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index f3c66fcc91a5..61c159dad98a 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.31 2004/09/21 14:14:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.32 2004/10/16 17:40:56 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xerces-1.3.1.ebuild,
+  xerces-2.3.0.ebuild, xerces-2.6.2-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   21 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -xerces-2.6.0.ebuild,
   xerces-2.6.2-r1.ebuild:
diff --git a/dev-java/xerces/xerces-1.3.1.ebuild b/dev-java/xerces/xerces-1.3.1.ebuild
index e4a041cb120e..9b8f53b3c963 100644
--- a/dev-java/xerces/xerces-1.3.1.ebuild
+++ b/dev-java/xerces/xerces-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1.ebuild,v 1.1 2004/09/17 11:41:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1.ebuild,v 1.2 2004/10/16 17:40:56 axxo Exp $
 
 inherit java-pkg
 
@@ -37,6 +37,6 @@ src_install () {
 	dohtml Readme.html
 
 	if use doc; then
-		dohtml -r docs/html/*
+		java-pkg_dohtml -r docs/html/*
 	fi
 }
diff --git a/dev-java/xerces/xerces-2.3.0.ebuild b/dev-java/xerces/xerces-2.3.0.ebuild
index da15e05b4d30..b5bf6c7dda61 100644
--- a/dev-java/xerces/xerces-2.3.0.ebuild
+++ b/dev-java/xerces/xerces-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0.ebuild,v 1.7 2004/09/17 09:31:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0.ebuild,v 1.8 2004/10/16 17:40:56 axxo Exp $
 
 inherit java-pkg
 
@@ -38,6 +38,6 @@ src_install () {
 	if use doc; then
 		dodir /usr/share/doc/${P}
 		cp -a samples ${D}/usr/share/doc/${P}
-		dohtml -r build/docs/javadocs
+		java-pkg_dohtml -r build/docs/javadocs
 	fi
 }
diff --git a/dev-java/xerces/xerces-2.6.2-r1.ebuild b/dev-java/xerces/xerces-2.6.2-r1.ebuild
index 6d4ca088ab9a..9e9e11444bd3 100644
--- a/dev-java/xerces/xerces-2.6.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.8 2004/09/21 14:14:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.9 2004/10/16 17:40:56 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -41,7 +41,7 @@ src_install() {
 	if use doc ; then
 		dodir /usr/share/doc/${P}
 		cp -a samples ${D}/usr/share/doc/${P}
-		dohtml -r build/docs/javadocs
+		java-pkg_dohtml -r build/docs/javadocs
 	fi
 }
 
diff --git a/dev-java/xml-commons-resolver/ChangeLog b/dev-java/xml-commons-resolver/ChangeLog
index 410bf89c98fd..6e02eecfce0a 100644
--- a/dev-java/xml-commons-resolver/ChangeLog
+++ b/dev-java/xml-commons-resolver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xml-commons-resolver
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/ChangeLog,v 1.1 2004/09/17 09:36:09 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/ChangeLog,v 1.2 2004/10/16 17:41:15 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  xml-commons-resolver-1.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *xml-commons-resolver-1.1 (17 Sep 2004)
 
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild
index c817b0f9ee64..7dafe4840eb2 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild,v 1.1 2004/09/17 09:36:09 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild,v 1.2 2004/10/16 17:41:15 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -22,5 +22,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar src/${PN}.jar
-	use doc && dohtml -r docs/ apidocs/
+	use doc && java-pkg_dohtml -r docs/ apidocs/
 }
diff --git a/dev-java/xmlrpc/ChangeLog b/dev-java/xmlrpc/ChangeLog
index e733888b7155..c511568455d4 100644
--- a/dev-java/xmlrpc/ChangeLog
+++ b/dev-java/xmlrpc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmlrpc
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlrpc/ChangeLog,v 1.3 2004/08/30 18:22:06 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlrpc/ChangeLog,v 1.4 2004/10/16 17:41:35 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xmlrpc-1.2_beta1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   30 Aug 2004; Chris Aniszczyk <zx@gentoo.org> xmlrpc-1.2_beta1.ebuild:
   Marking stable x86
diff --git a/dev-java/xmlrpc/xmlrpc-1.2_beta1.ebuild b/dev-java/xmlrpc/xmlrpc-1.2_beta1.ebuild
index 8bfda29459b9..cc87173188e3 100644
--- a/dev-java/xmlrpc/xmlrpc-1.2_beta1.ebuild
+++ b/dev-java/xmlrpc/xmlrpc-1.2_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlrpc/xmlrpc-1.2_beta1.ebuild,v 1.2 2004/08/30 18:22:06 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlrpc/xmlrpc-1.2_beta1.ebuild,v 1.3 2004/10/16 17:41:35 axxo Exp $
 
 inherit java-pkg
 
@@ -38,7 +38,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/xmlrpc-${MY_PV}*.jar || die
 	dodoc *.txt
-	use doc && dohtml -r api
+	use doc && java-pkg_dohtml -r api
 }
 
 pkg_postinst() {
diff --git a/dev-java/xmojo-bin/ChangeLog b/dev-java/xmojo-bin/ChangeLog
index 6024d14ff647..449b3285a349 100644
--- a/dev-java/xmojo-bin/ChangeLog
+++ b/dev-java/xmojo-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmojo-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmojo-bin/ChangeLog,v 1.3 2004/09/29 23:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmojo-bin/ChangeLog,v 1.4 2004/10/16 17:41:54 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xmojo-bin-5.0.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *xmojo-bin-5.0.0 (03 May 2004)
 
diff --git a/dev-java/xmojo-bin/xmojo-bin-5.0.0.ebuild b/dev-java/xmojo-bin/xmojo-bin-5.0.0.ebuild
index dfffbfc5c2ff..737f59bcf820 100644
--- a/dev-java/xmojo-bin/xmojo-bin-5.0.0.ebuild
+++ b/dev-java/xmojo-bin/xmojo-bin-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmojo-bin/xmojo-bin-5.0.0.ebuild,v 1.3 2004/06/24 22:46:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmojo-bin/xmojo-bin-5.0.0.ebuild,v 1.4 2004/10/16 17:41:54 axxo Exp $
 
 inherit java-pkg
 
@@ -30,7 +30,7 @@ src_install() {
 	java-pkg_dojar lib/AdventNetUpdateManager.jar
 
 	if use doc ; then
-		dohtml -r docs/*
+		java-pkg_dohtml -r docs/*
 	fi
 
 	dodoc COPYRIGHT LICENSE_AGREEMENT README.html
diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 504bf1da6802..1b0b1d027dad 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.7 2004/10/07 15:18:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.8 2004/10/16 17:42:15 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xom-1.0_beta5.ebuild,
+  xom-1.0_beta6.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *xom-1.0_beta6 (07 Oct 2004)
 
diff --git a/dev-java/xom/xom-1.0_beta5.ebuild b/dev-java/xom/xom-1.0_beta5.ebuild
index 5ec9a23bceff..aaa634740c07 100644
--- a/dev-java/xom/xom-1.0_beta5.ebuild
+++ b/dev-java/xom/xom-1.0_beta5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta5.ebuild,v 1.1 2004/09/19 15:12:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta5.ebuild,v 1.2 2004/10/16 17:42:15 axxo Exp $
 
 inherit java-pkg
 
@@ -52,6 +52,6 @@ src_install() {
 	if use doc ; then
 		dodir /usr/share/doc/${P}
 		cd ${WORKDIR}/XOM/
-		dohtml -r apidocs/
+		java-pkg_dohtml -r apidocs/
 	fi
 }
diff --git a/dev-java/xom/xom-1.0_beta6.ebuild b/dev-java/xom/xom-1.0_beta6.ebuild
index 551f2521780b..4a1b4fe2afa9 100644
--- a/dev-java/xom/xom-1.0_beta6.ebuild
+++ b/dev-java/xom/xom-1.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta6.ebuild,v 1.1 2004/10/07 15:18:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta6.ebuild,v 1.2 2004/10/16 17:42:15 axxo Exp $
 
 inherit java-pkg
 
@@ -52,6 +52,6 @@ src_install() {
 	if use doc ; then
 		dodir /usr/share/doc/${P}
 		cd ${WORKDIR}/XOM/
-		dohtml -r apidocs/
+		java-pkg_dohtml -r apidocs/
 	fi
 }
diff --git a/dev-java/xt-bin/ChangeLog b/dev-java/xt-bin/ChangeLog
index 00d510720acb..fdbce0afae88 100644
--- a/dev-java/xt-bin/ChangeLog
+++ b/dev-java/xt-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xt-bin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt-bin/ChangeLog,v 1.3 2004/09/05 07:23:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt-bin/ChangeLog,v 1.4 2004/10/16 17:42:34 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xt-bin-20020426a.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/xt-bin/xt-bin-20020426a.ebuild b/dev-java/xt-bin/xt-bin-20020426a.ebuild
index 643195e846cc..048507ff7232 100644
--- a/dev-java/xt-bin/xt-bin-20020426a.ebuild
+++ b/dev-java/xt-bin/xt-bin-20020426a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt-bin/xt-bin-20020426a.ebuild,v 1.2 2004/08/03 12:08:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt-bin/xt-bin-20020426a.ebuild,v 1.3 2004/10/16 17:42:34 axxo Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_compile() { :; }
 src_install() {
 	java-pkg_dojar *.jar
 	dohtml xt.html
-	use doc && dohtml -r demo/* && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r demo/* && java-pkg_dohtml -r docs/*
 }