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

author: Thomas Matthijs <axxo@gentoo.org> 2004-10-16 17:42:34 +0000
committer: Thomas Matthijs <axxo@gentoo.org> 2004-10-16 17:42:34 +0000
commit: c79ebad8f9d5608e516a9916f7bf951481c3a9bf (patch)
tree: 6e26809a1b9be56137c9d33572e2aa403a327817 /dev-java
parent: old (diff)
download: historical-c79ebad8f9d5608e516a9916f7bf951481c3a9bf.tar.gz
historical-c79ebad8f9d5608e516a9916f7bf951481c3a9bf.tar.bz2
historical-c79ebad8f9d5608e516a9916f7bf951481c3a9bf.zip
332 files changed, 1191 insertions, 558 deletions
diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index 66d45b269d77..f94e3866de3b 100644
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-contrib
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.3 2004/09/10 19:42:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.4 2004/10/16 16:56:45 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  ant-contrib-1.0_beta1-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *ant-contrib-1.0_beta1-r1 (10 Sep 2004)
 
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild
index bafc340efa30..7653a67896fa 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta1-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/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild,v 1.1 2004/09/10 19:42:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild,v 1.2 2004/10/16 16:56:45 axxo Exp $
 
 inherit java-pkg
 
@@ -32,6 +32,6 @@ src_install() {
 	dosym /usr/share/${PN}/lib/${PN}-${PV}.jar /usr/share/ant-core/lib/
 
 	dodoc README.txt
-	use doc && dohtml -r build/docs
-	dohtml -r manual
+	use doc && java-pkg_dohtml -r build/docs
+	java-pkg_dohtml -r manual
 }
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 89e3db1461f4..5233ecc62b34 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.7 2004/10/16 08:32:47 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.8 2004/10/16 16:57:22 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> ant-core-1.5.4-r2.ebuild,
+  ant-core-1.6.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ant-core-1.6.2.ebuild:
   Stable on amd64.
diff --git a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
index cfcc4739d1d8..857ea2b25c59 100644
--- a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.5.4-r2.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/ant-core/ant-core-1.5.4-r2.ebuild,v 1.1 2004/09/22 16:45:40 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.2 2004/10/16 16:57:22 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -100,5 +100,5 @@ src_install() {
 
 	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
 	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/ant-core/ant-core-1.6.2.ebuild b/dev-java/ant-core/ant-core-1.6.2.ebuild
index 89b50fa438c9..bcff4ca097ab 100644
--- a/dev-java/ant-core/ant-core-1.6.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.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/ant-core/ant-core-1.6.2.ebuild,v 1.3 2004/10/16 08:32:47 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2.ebuild,v 1.4 2004/10/16 16:57:22 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -68,5 +68,5 @@ src_install() {
 
 	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
 	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index a8b5b5c25a3a..1ea5ac324860 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.20 2004/09/04 12:59:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.21 2004/10/16 16:57:44 axxo Exp $
+
+*antlr-2.7.4 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> antlr-2.7.3.ebuild,
+  antlr-2.7.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> antlr-2.7.3.ebuild:
   stable on sparc
diff --git a/dev-java/antlr/antlr-2.7.3.ebuild b/dev-java/antlr/antlr-2.7.3.ebuild
index 908695363d1c..275645a69cf9 100644
--- a/dev-java/antlr/antlr-2.7.3.ebuild
+++ b/dev-java/antlr/antlr-2.7.3.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/antlr/antlr-2.7.3.ebuild,v 1.6 2004/09/04 12:59:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.3.ebuild,v 1.7 2004/10/16 16:57:45 axxo Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_install () {
 	insinto /usr/share/antlr
 	java-pkg_dojar *.jar
 	doins extras/antlr-mode.el
-	dohtml -r doc/*
+	java-pkg_dohtml -r doc/*
 	cp -R examples ${D}/usr/share/doc/${P}/
 	dodoc RIGHTS
 	cd lib/cpp
diff --git a/dev-java/antlr/antlr-2.7.4.ebuild b/dev-java/antlr/antlr-2.7.4.ebuild
index 1711f191cd92..88906c21ebde 100644
--- a/dev-java/antlr/antlr-2.7.4.ebuild
+++ b/dev-java/antlr/antlr-2.7.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/antlr/antlr-2.7.4.ebuild,v 1.1 2004/07/15 16:33:48 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.4.ebuild,v 1.2 2004/10/16 16:57:45 axxo Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_install () {
 	insinto /usr/share/antlr
 	java-pkg_dojar *.jar
 	doins extras/antlr-mode.el
-	dohtml -r doc/*
+	java-pkg_dohtml -r doc/*
 	cp -R examples ${D}/usr/share/doc/${P}/
 	dodoc RIGHTS
 	cd lib/cpp
diff --git a/dev-java/asm/ChangeLog b/dev-java/asm/ChangeLog
index ebfcc6d82319..0538a8488d76 100644
--- a/dev-java/asm/ChangeLog
+++ b/dev-java/asm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/asm
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.9 2004/09/29 23:48:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.10 2004/10/16 16:58:14 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> asm-1.4.3-r1.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> asm-1.4.3-r1.ebuild,
   -asm-1.4.3.ebuild:
diff --git a/dev-java/asm/asm-1.4.3-r1.ebuild b/dev-java/asm/asm-1.4.3-r1.ebuild
index e8354ca043e6..c70047557a01 100644
--- a/dev-java/asm/asm-1.4.3-r1.ebuild
+++ b/dev-java/asm/asm-1.4.3-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/asm/asm-1.4.3-r1.ebuild,v 1.2 2004/08/24 03:23:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-1.4.3-r1.ebuild,v 1.3 2004/10/16 16:58:14 axxo Exp $
 
 inherit java-pkg
 
@@ -33,6 +33,6 @@ src_install() {
 	for x in output/dist/lib/*.jar ; do
 		java-pkg_dojar $x
 	done
-	use doc && dohtml -r output/dist/doc/javadoc/user/*
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
 }
 
diff --git a/dev-java/aterm-java/ChangeLog b/dev-java/aterm-java/ChangeLog
index f380b76ae268..3268089e8967 100644
--- a/dev-java/aterm-java/ChangeLog
+++ b/dev-java/aterm-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/aterm-java
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aterm-java/ChangeLog,v 1.6 2004/09/30 00:00:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aterm-java/ChangeLog,v 1.7 2004/10/16 16:59:20 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> aterm-java-1.6.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Gentoo Technologies, Inc. -> Gentoo Foundation
diff --git a/dev-java/aterm-java/aterm-java-1.6.ebuild b/dev-java/aterm-java/aterm-java-1.6.ebuild
index d453a46e8763..0d5eae6607ff 100644
--- a/dev-java/aterm-java/aterm-java-1.6.ebuild
+++ b/dev-java/aterm-java/aterm-java-1.6.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/aterm-java/aterm-java-1.6.ebuild,v 1.5 2004/08/24 03:29:20 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aterm-java/aterm-java-1.6.ebuild,v 1.6 2004/10/16 16:59:20 axxo Exp $
 
 inherit java-pkg
 
@@ -32,6 +32,6 @@ src_install() {
 	exeinto /usr/bin
 	doexe aterm-java-config
 
-	dohtml -r api
+	java-pkg_dohtml -r api
 	dodoc AUTHORS COPYING INSTALL ChangeLog
 }
diff --git a/dev-java/avalon-logkit-bin/ChangeLog b/dev-java/avalon-logkit-bin/ChangeLog
index e7340566dbbd..0665a7d010f7 100644
--- a/dev-java/avalon-logkit-bin/ChangeLog
+++ b/dev-java/avalon-logkit-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/avalon-logkit-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/ChangeLog,v 1.3 2004/09/05 06:04:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/ChangeLog,v 1.4 2004/10/16 16:59:47 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  avalon-logkit-bin-1.2.2.ebuild, avalon-logkit-bin-1.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/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild
index fad1edaf498f..92592a448cb1 100644
--- a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild
+++ b/dev-java/avalon-logkit-bin/avalon-logkit-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/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild,v 1.2 2004/07/31 11:48:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild,v 1.3 2004/10/16 16:59:47 axxo Exp $
 
 inherit java-pkg
 
@@ -23,5 +23,5 @@ src_install() {
 	mv ${MY_P/avalon-}.jar ${PN/-bin}.jar
 	java-pkg_dojar ${PN/-bin}.jar || die "Unable to Install"
 	dodoc README.txt
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild
index ad034bf549f1..f9b4317760da 100644
--- a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild
+++ b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.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/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild,v 1.2 2004/07/31 11:48:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild,v 1.3 2004/10/16 16:59:47 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="LogKit is an easy-to-use Java logging toolkit designed for secure, performance-oriented logging."
 HOMEPAGE="http://avalon.apache.org/"
@@ -16,6 +18,6 @@ IUSE="doc"
 
 src_install () {
 	cd ${WORKDIR}/${MY_P}
-	dojar *.jar || die "Unable to Install"
-	use doc && dohtml -r docs/*
+	java-pkg_dojar *.jar || die "Unable to Install"
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/avalon-phoenix/ChangeLog b/dev-java/avalon-phoenix/ChangeLog
index 91dd9057329f..306395c4ef9b 100644
--- a/dev-java/avalon-phoenix/ChangeLog
+++ b/dev-java/avalon-phoenix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/avalon-phoenix
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-phoenix/ChangeLog,v 1.7 2004/06/24 22:17:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-phoenix/ChangeLog,v 1.8 2004/10/16 17:00:22 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  avalon-phoenix-4.0.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> avalon-phoenix-4.0.4.ebuild:
   Fix use invocation
diff --git a/dev-java/avalon-phoenix/avalon-phoenix-4.0.4.ebuild b/dev-java/avalon-phoenix/avalon-phoenix-4.0.4.ebuild
index 01d43db86505..61a7b668bcaf 100644
--- a/dev-java/avalon-phoenix/avalon-phoenix-4.0.4.ebuild
+++ b/dev-java/avalon-phoenix/avalon-phoenix-4.0.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/avalon-phoenix/avalon-phoenix-4.0.4.ebuild,v 1.9 2004/06/24 22:17:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-phoenix/avalon-phoenix-4.0.4.ebuild,v 1.10 2004/10/16 17:00:22 axxo Exp $
+
+inherit java-pkg
 
 MY_P=phoenix-${PV}
 DESCRIPTION="Avalon Phoenix is a API for java-based servers"
@@ -17,7 +19,6 @@ IUSE="jikes debug"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-
 	if use jikes
 	then
 		echo "build.compiler=jikes\n" > ${S}/.ant.properties
@@ -33,16 +34,13 @@ src_compile() {
 	echo "phoenix.home=phoenix-home" >> ${S}/.ant.properties
 	echo "base.path=/opt" >> ${S}/.ant.properties 	#Is this really needed?
 
-	ant get-mx4j main
-
+	ant get-mx4j main || die "failed to build"
 }
 
 src_install() {
-
-	dojar dist/bin/lib/*.jar
-	dojar dist/bin/phoenix-loader.jar
+	java-pkg_dojar dist/bin/lib/*.jar
+	java-pkg_dojar dist/bin/phoenix-loader.jar
 	dodoc README.txt LICENSE.txt
 	dodir /usr/share/doc/
-	dohtml -A .css .jpg .gif -r docs
-
+	java-pkg_dohtml -A .css .jpg .gif -r docs
 }
diff --git a/dev-java/axion/ChangeLog b/dev-java/axion/ChangeLog
index 0629e577b2e6..5d85b75134d3 100644
--- a/dev-java/axion/ChangeLog
+++ b/dev-java/axion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/axion
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/ChangeLog,v 1.8 2004/09/29 23:50:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/ChangeLog,v 1.9 2004/10/16 17:00:49 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> axion-1.0_rc2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> axion-1.0_rc2.ebuild:
   move regexp-bin -> regexp
diff --git a/dev-java/axion/axion-1.0_rc2.ebuild b/dev-java/axion/axion-1.0_rc2.ebuild
index 4d2f753fafc5..4d6d00b4fb1c 100644
--- a/dev-java/axion/axion-1.0_rc2.ebuild
+++ b/dev-java/axion/axion-1.0_rc2.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/axion/axion-1.0_rc2.ebuild,v 1.8 2004/09/04 12:59:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/axion-1.0_rc2.ebuild,v 1.9 2004/10/16 17:00:49 axxo Exp $
 
 inherit java-pkg
 
@@ -53,5 +53,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar bin/axion-1.0-M2.jar
-	use doc && dohtml -r bin/docs/api
+	use doc && java-pkg_dohtml -r bin/docs/api
 }
diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index e325de28aab0..12794b168d72 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/batik
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.12 2004/09/19 15:31:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.13 2004/10/16 17:01:14 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> batik-1.5.1-r1.ebuild,
+  batik-1.5.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *batik-1.5.1-r1 (19 Sep 2004)
 
diff --git a/dev-java/batik/batik-1.5.1-r1.ebuild b/dev-java/batik/batik-1.5.1-r1.ebuild
index 406944f41530..6e941dbc464e 100644
--- a/dev-java/batik/batik-1.5.1-r1.ebuild
+++ b/dev-java/batik/batik-1.5.1-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/batik/batik-1.5.1-r1.ebuild,v 1.1 2004/09/19 15:31:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r1.ebuild,v 1.2 2004/10/16 17:01:14 axxo Exp $
 
 inherit java-pkg
 
@@ -40,5 +40,5 @@ src_install () {
 	doins ${P}/lib/*.jar
 
 	dodoc README LICENSE
-	use doc && dohtml -r ${P}/docs/
+	use doc && java-pkg_dohtml -r ${P}/docs/
 }
diff --git a/dev-java/batik/batik-1.5.1.ebuild b/dev-java/batik/batik-1.5.1.ebuild
index ef2a08f0021a..6b0ebd9075b1 100644
--- a/dev-java/batik/batik-1.5.1.ebuild
+++ b/dev-java/batik/batik-1.5.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/batik/batik-1.5.1.ebuild,v 1.1 2004/08/13 21:23:35 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1.ebuild,v 1.2 2004/10/16 17:01:14 axxo Exp $
 
 inherit java-pkg
 
@@ -32,5 +32,5 @@ src_install () {
 	doins ${P}/lib/*.jar
 
 	dodoc README LICENSE
-	use doc && dohtml -r ${P}/docs/
+	use doc && java-pkg_dohtml -r ${P}/docs/
 }
diff --git a/dev-java/bcel/ChangeLog b/dev-java/bcel/ChangeLog
index 10806c26f1bb..c0669907f4fa 100644
--- a/dev-java/bcel/ChangeLog
+++ b/dev-java/bcel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bcel
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.15 2004/09/10 19:46:20 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.16 2004/10/16 17:01:34 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> bcel-5.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> bcel-5.1.ebuild:
   depend on ant-core
diff --git a/dev-java/bcel/bcel-5.1.ebuild b/dev-java/bcel/bcel-5.1.ebuild
index fe1510a46188..b0de3f5a1bf0 100644
--- a/dev-java/bcel/bcel-5.1.ebuild
+++ b/dev-java/bcel/bcel-5.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/bcel/bcel-5.1.ebuild,v 1.19 2004/09/21 13:37:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1.ebuild,v 1.20 2004/10/16 17:01:34 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 	dodoc LICENSE.txt
 	java-pkg_dojar bin/bcel.jar
 }
diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index 687cbc1c17de..6f8ddcc3ca5d 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.10 2004/10/14 20:05:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.11 2004/10/16 17:01:53 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> bsf-2.3.0-r1.ebuild,
+  bsf-2.3.0-r2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   14 Oct 2004; David Holm <dholm@gentoo.org> bsf-2.3.0-r2.ebuild:
   Added to ~ppc.
diff --git a/dev-java/bsf/bsf-2.3.0-r1.ebuild b/dev-java/bsf/bsf-2.3.0-r1.ebuild
index 5de9db45578e..f6cee38bd77a 100644
--- a/dev-java/bsf/bsf-2.3.0-r1.ebuild
+++ b/dev-java/bsf/bsf-2.3.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/bsf/bsf-2.3.0-r1.ebuild,v 1.5 2004/09/04 13:00:17 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r1.ebuild,v 1.6 2004/10/16 17:01:53 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -58,5 +58,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar src/build/lib/bsf.jar
 
-	use doc && dohtml -r src/build/javadocs/*
+	use doc && java-pkg_dohtml -r src/build/javadocs/*
 }
diff --git a/dev-java/bsf/bsf-2.3.0-r2.ebuild b/dev-java/bsf/bsf-2.3.0-r2.ebuild
index 3e1b2315d698..a29ec9058605 100644
--- a/dev-java/bsf/bsf-2.3.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r2.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/bsf/bsf-2.3.0-r2.ebuild,v 1.2 2004/10/14 20:05:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.3 2004/10/16 17:01:53 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -52,5 +52,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar src/build/lib/bsf.jar
 
-	use doc && dohtml -r src/build/javadocs/*
+	use doc && java-pkg_dohtml -r src/build/javadocs/*
 }
diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index 368ad37f8563..dbc7eda81b0a 100644
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/c3p0
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.5 2004/08/24 03:41:23 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.6 2004/10/16 17:02:12 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> c3p0-0.8.4.5.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> c3p0-0.8.4.5.ebuild:
   Marking stable on x86
diff --git a/dev-java/c3p0/c3p0-0.8.4.5.ebuild b/dev-java/c3p0/c3p0-0.8.4.5.ebuild
index d90610f2ce19..618860820336 100644
--- a/dev-java/c3p0/c3p0-0.8.4.5.ebuild
+++ b/dev-java/c3p0/c3p0-0.8.4.5.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/c3p0/c3p0-0.8.4.5.ebuild,v 1.4 2004/08/24 03:41:23 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.4.5.ebuild,v 1.5 2004/10/16 17:02:12 axxo Exp $
 
 inherit java-pkg
 
@@ -33,5 +33,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar build/${PN}*.jar || die "installation failed"
 	dodoc README-SRC
-	use doc && dohtml -r build/apidocs/*
+	use doc && java-pkg_dohtml -r build/apidocs/*
 }
diff --git a/dev-java/charva/ChangeLog b/dev-java/charva/ChangeLog
index f1b8fc249f44..0c06dcc1db51 100644
--- a/dev-java/charva/ChangeLog
+++ b/dev-java/charva/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/charva
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/ChangeLog,v 1.5 2004/07/02 04:19:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/ChangeLog,v 1.6 2004/10/16 17:02:31 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> charva-1.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> charva-1.0.1.ebuild:
   virtual/glibc -> virtual/libc
diff --git a/dev-java/charva/charva-1.0.1.ebuild b/dev-java/charva/charva-1.0.1.ebuild
index e500384ee7aa..faa7a98496f4 100644
--- a/dev-java/charva/charva-1.0.1.ebuild
+++ b/dev-java/charva/charva-1.0.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/charva/charva-1.0.1.ebuild,v 1.5 2004/07/02 04:19:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/charva-1.0.1.ebuild,v 1.6 2004/10/16 17:02:31 axxo Exp $
 
 inherit java-pkg
 
@@ -33,6 +33,6 @@ src_install () {
 	cd ${S}
 	dolib.so c/src/*.so
 	java-pkg_dojar java/lib/${PN}.jar
-	use doc && dohtml -r java/doc
+	use doc && java-pkg_dohtml -r java/doc
 	dodoc README
 }
diff --git a/dev-java/classworlds/ChangeLog b/dev-java/classworlds/ChangeLog
index 55e296c5f646..ef9aa6d9ac74 100644
--- a/dev-java/classworlds/ChangeLog
+++ b/dev-java/classworlds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/classworlds
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/classworlds/ChangeLog,v 1.8 2004/08/24 03:42:24 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/classworlds/ChangeLog,v 1.9 2004/10/16 17:02:50 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> classworlds-1.0-r2.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> classworlds-1.0-r2.ebuild:
   Marking x86
diff --git a/dev-java/classworlds/classworlds-1.0-r2.ebuild b/dev-java/classworlds/classworlds-1.0-r2.ebuild
index 09694c03222d..09a5d3b6f27d 100644
--- a/dev-java/classworlds/classworlds-1.0-r2.ebuild
+++ b/dev-java/classworlds/classworlds-1.0-r2.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/classworlds/classworlds-1.0-r2.ebuild,v 1.5 2004/08/24 03:42:24 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/classworlds/classworlds-1.0-r2.ebuild,v 1.6 2004/10/16 17:02:50 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	dodoc LICENSE.txt
 	java-pkg_dojar target/classworlds-1.0.jar
-	use doc && dohtml -r dist/docs/api
+	use doc && java-pkg_dohtml -r dist/docs/api
 }
diff --git a/dev-java/cocoon/ChangeLog b/dev-java/cocoon/ChangeLog
index 6f9e50585616..292241a018e4 100644
--- a/dev-java/cocoon/ChangeLog
+++ b/dev-java/cocoon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/cocoon
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.2 2004/09/05 06:06:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.3 2004/10/16 17:03:09 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> cocoon-2.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/cocoon/cocoon-2.1.4.ebuild b/dev-java/cocoon/cocoon-2.1.4.ebuild
index 2d869e8d4dcf..dfabab996f08 100644
--- a/dev-java/cocoon/cocoon-2.1.4.ebuild
+++ b/dev-java/cocoon/cocoon-2.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/cocoon/cocoon-2.1.4.ebuild,v 1.1 2004/08/15 17:09:38 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.4.ebuild,v 1.2 2004/10/16 17:03:09 axxo Exp $
 
 inherit java-pkg
 
@@ -52,7 +52,7 @@ src_install() {
 	dodoc legal/*
 
 	docinto api
-	use doc && dohtml -r build/webapp/api/*
+	use doc && java-pkg_dohtml -r build/webapp/api/*
 }
 
 pkg_postinst() {
diff --git a/dev-java/colt/ChangeLog b/dev-java/colt/ChangeLog
index 12b5ff3b9872..7ef1134cea6d 100644
--- a/dev-java/colt/ChangeLog
+++ b/dev-java/colt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/colt
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/ChangeLog,v 1.4 2004/08/03 11:24:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/ChangeLog,v 1.5 2004/10/16 17:03:33 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> colt-1.1.0.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> colt-1.1.0.ebuild:
   Added to ~ppc.
diff --git a/dev-java/colt/colt-1.1.0.ebuild b/dev-java/colt/colt-1.1.0.ebuild
index f94613eed73b..968ad6f71f7a 100644
--- a/dev-java/colt/colt-1.1.0.ebuild
+++ b/dev-java/colt/colt-1.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/colt/colt-1.1.0.ebuild,v 1.4 2004/08/03 11:24:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.1.0.ebuild,v 1.5 2004/10/16 17:03:33 axxo Exp $
 
 inherit java-pkg
 
@@ -30,5 +30,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/*.jar
 	dohtml README.html
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index 18a62182cb70..4fbe90069930 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-beanutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.14 2004/09/10 19:46:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.15 2004/10/16 17:03:53 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-beanutils-1.6.1-r1.ebuild, commons-beanutils-1.7.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   10 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
   commons-beanutils-1.6.1-r1.ebuild, commons-beanutils-1.7.0.ebuild:
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild
index 23cbd45f60a1..bf7eae066dd3 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-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/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild,v 1.6 2004/09/10 19:46:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild,v 1.7 2004/10/16 17:03:53 axxo Exp $
 
 inherit java-pkg
 
@@ -52,6 +52,6 @@ src_install () {
 	dohtml STATUS.html PROPOSAL.html
 
 	if use doc ; then
-		dohtml -r dist/docs/*
+		java-pkg_dohtml -r dist/docs/*
 	fi
 }
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild
index e1101ceb270b..b6c180c45081 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.7.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/commons-beanutils/commons-beanutils-1.7.0.ebuild,v 1.2 2004/09/10 19:46:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild,v 1.3 2004/10/16 17:03:53 axxo Exp $
 
 inherit java-pkg
 
@@ -46,5 +46,5 @@ src_install () {
 	dodoc RELEASE-NOTES.txt LICENSE
 	dohtml STATUS.html PROPOSAL.html
 
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index 1ad0327caed4..e4dce5cb7f4c 100644
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-cli
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.13 2004/08/19 19:00:19 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.14 2004/10/16 17:04:14 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-cli-1.0-r4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   19 Aug 2004; Travis Tilley <lv@gentoo.org> commons-cli-1.0-r4.ebuild:
   stable on amd64
diff --git a/dev-java/commons-cli/commons-cli-1.0-r4.ebuild b/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
index fc0c3fcd2175..9df6c4d6c386 100644
--- a/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.0-r4.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/commons-cli/commons-cli-1.0-r4.ebuild,v 1.3 2004/08/19 19:00:19 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r4.ebuild,v 1.4 2004/10/16 17:04:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -38,7 +38,7 @@ src_compile() {
 src_install() {
 	mv ${S}/target/${P}.jar ${S}/target/${PN}.jar
 	java-pkg_dojar target/${PN}.jar
-	use doc && dohtml -r target/docs/
+	use doc && java-pkg_dohtml -r target/docs/
 	dodoc README.txt
 }
 
diff --git a/dev-java/commons-codec/ChangeLog b/dev-java/commons-codec/ChangeLog
index 970c83c5a963..0d239d90b599 100644
--- a/dev-java/commons-codec/ChangeLog
+++ b/dev-java/commons-codec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-codec
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.10 2004/10/02 15:23:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.11 2004/10/16 17:04:32 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-codec-1.3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   13 Aug 2004; Chris Aniszczyk <zx@gentoo.org> -commons-codec-1.2.ebuild:
   Clean up
diff --git a/dev-java/commons-codec/commons-codec-1.3.ebuild b/dev-java/commons-codec/commons-codec-1.3.ebuild
index 0fd7fa64620f..d022ebea66bc 100644
--- a/dev-java/commons-codec/commons-codec-1.3.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.3.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/commons-codec/commons-codec-1.3.ebuild,v 1.1 2004/08/13 21:29:23 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3.ebuild,v 1.2 2004/10/16 17:04:32 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_install() {
 	java-pkg_dojar output/dist/${PN}.jar
 
 	dodoc RELEASE-NOTES.txt
-	use doc && dohtml -r output/dist/docs/
+	use doc && java-pkg_dohtml -r output/dist/docs/
 }
diff --git a/dev-java/commons-collections/ChangeLog b/dev-java/commons-collections/ChangeLog
index df8a6af8f788..eddb7e1da2f2 100644
--- a/dev-java/commons-collections/ChangeLog
+++ b/dev-java/commons-collections/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-collections
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.22 2004/08/24 03:46:38 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.23 2004/10/16 17:04:51 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-collections-3.1.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>
   -commons-collections-3.0-r1.ebuild, commons-collections-3.1.ebuild:
diff --git a/dev-java/commons-collections/commons-collections-3.1.ebuild b/dev-java/commons-collections/commons-collections-3.1.ebuild
index cca97056df7d..eed51d08ca67 100644
--- a/dev-java/commons-collections/commons-collections-3.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-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/commons-collections/commons-collections-3.1.ebuild,v 1.2 2004/08/24 03:46:38 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.1.ebuild,v 1.3 2004/10/16 17:04:51 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,6 +30,6 @@ src_install() {
 	mv build/${P}.jar build/${PN}.jar
 	java-pkg_dojar build/${PN}.jar
 	dodoc LICENSE.txt README.txt
-	use doc && dohtml -r build/docs/apidocs
+	use doc && java-pkg_dohtml -r build/docs/apidocs
 	dohtml *.html
 }
diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index 37424f6ca625..699a75d32426 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-daemon
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.4 2004/07/02 04:19:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.5 2004/10/16 17:05:10 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-daemon-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   commons-daemon-1.0.ebuild:
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.ebuild
index 82e08706f040..5f91743b7323 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-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/commons-daemon/commons-daemon-1.0.ebuild,v 1.4 2004/07/02 04:19:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.ebuild,v 1.5 2004/10/16 17:05:10 axxo Exp $
 
 inherit java-pkg
 
@@ -33,5 +33,5 @@ src_install () {
 	java-pkg_dojar dist/${PN}.jar || die "Unable to install"
 	dodoc README RELEASE-NOTES.txt *.html
 	cp -R src/samples ${D}/usr/share/doc/${P}/
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index e67cf72191fe..93513fd2327f 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.14 2004/08/13 21:35:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.15 2004/10/16 17:05:31 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-dbcp-1.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *commons-dbcp-1.2.1 (13 Aug 2004)
 
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild
index 5eaa372e15e6..33fa10b768c0 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.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/commons-dbcp/commons-dbcp-1.2.1.ebuild,v 1.1 2004/08/13 21:35:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild,v 1.2 2004/10/16 17:05:31 axxo Exp $
 
 inherit java-pkg
 
@@ -33,5 +33,5 @@ src_install () {
 	java-pkg_dojar dist/${PN}*.jar || die "Unable to install"
 	dodoc README.txt
 	dohtml PROPOSAL.html STATUS.html
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 40bef5037ff0..4251acb93e7e 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.13 2004/09/10 23:31:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.14 2004/10/16 17:05:51 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-digester-1.5.ebuild, commons-digester-1.6.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *commons-digester-1.6 (11 Sep 2004)
 
diff --git a/dev-java/commons-digester/commons-digester-1.5.ebuild b/dev-java/commons-digester/commons-digester-1.5.ebuild
index 4c61fb9a043e..4f0c35f9b526 100644
--- a/dev-java/commons-digester/commons-digester-1.5.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.5.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/commons-digester/commons-digester-1.5.ebuild,v 1.5 2004/09/10 13:57:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.5.ebuild,v 1.6 2004/10/16 17:05:51 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	use doc && dohtml -r dist/docs/api/*
+	use doc && java-pkg_dohtml -r dist/docs/api/*
 }
diff --git a/dev-java/commons-digester/commons-digester-1.6.ebuild b/dev-java/commons-digester/commons-digester-1.6.ebuild
index a8a584dab73c..4de0a9fa57a9 100644
--- a/dev-java/commons-digester/commons-digester-1.6.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.6.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/commons-digester/commons-digester-1.6.ebuild,v 1.1 2004/09/10 23:31:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.6.ebuild,v 1.2 2004/10/16 17:05:51 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	use doc && dohtml -r dist/docs/api/*
+	use doc && java-pkg_dohtml -r dist/docs/api/*
 }
diff --git a/dev-java/commons-discovery/ChangeLog b/dev-java/commons-discovery/ChangeLog
index a21866493145..d1d02e81663a 100644
--- a/dev-java/commons-discovery/ChangeLog
+++ b/dev-java/commons-discovery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-discovery
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.8 2004/06/27 17:24:24 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.9 2004/10/16 17:06:10 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-discovery-0.2-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org>
   commons-discovery-0.2-r1.ebuild:
diff --git a/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild b/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild
index 1274d25b6595..dc85d51a0da2 100644
--- a/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild
+++ b/dev-java/commons-discovery/commons-discovery-0.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/commons-discovery/commons-discovery-0.2-r1.ebuild,v 1.4 2004/06/27 17:27:41 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild,v 1.5 2004/10/16 17:06:10 axxo Exp $
 
 inherit java-pkg
 
@@ -30,7 +30,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 	dohtml PROPOSAL.html STATUS.html best-practices.html
 	dodoc TODO
 }
diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index f529c7778aa6..24c9bb0c4f04 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-fileupload
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.12 2004/06/27 17:29:43 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.13 2004/10/16 17:06:30 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-fileupload-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> commons-fileupload-1.0.ebuild:
   Marking stable on ppc
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
index f69181465c56..a35e7011c593 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-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/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.9 2004/06/27 17:29:43 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.10 2004/10/16 17:06:30 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -35,5 +35,5 @@ src_compile() {
 src_install() {
 	mv ${S}/target/${P}.jar ${S}/target/${PN}.jar
 	java-pkg_dojar target/${PN}.jar
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index 106ed7f0b415..0ab273268c5a 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-httpclient
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.10 2004/10/13 17:07:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.11 2004/10/16 17:06:51 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-httpclient-2.0-r1.ebuild, commons-httpclient-2.0.1.ebuild,
+  commons-httpclient-2.0.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *commons-httpclient-2.0.2 (13 Oct 2004)
 
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild
index 3c31388ae563..3a5199f74a69 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.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/commons-httpclient/commons-httpclient-2.0-r1.ebuild,v 1.4 2004/06/24 22:22:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild,v 1.5 2004/10/16 17:06:51 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -35,5 +35,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild
index 65d29f4a3a71..d566b04b268f 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.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/commons-httpclient/commons-httpclient-2.0.1.ebuild,v 1.4 2004/10/12 19:26:27 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild,v 1.5 2004/10/16 17:06:51 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,5 +44,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
index 2dd96e2413bb..a2115896360c 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.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/commons-httpclient/commons-httpclient-2.0.2.ebuild,v 1.1 2004/10/13 17:07:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild,v 1.2 2004/10/16 17:06:51 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,5 +44,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 4e643db6861c..d8e138fbcb75 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-jxpath
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.3 2004/08/31 03:37:47 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.4 2004/10/16 17:07:10 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-jxpath-1.1.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> commons-jxpath-1.1.ebuild:
   Marking x86
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild
index 79ae2bbfe8e3..59f5142efa70 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-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/commons-jxpath/commons-jxpath-1.1.ebuild,v 1.3 2004/08/31 03:37:47 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild,v 1.4 2004/10/16 17:07:10 axxo Exp $
 
 inherit java-pkg
 
@@ -36,5 +36,5 @@ src_install() {
 	java-pkg_dojar dist/${PN}.jar
 
 	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/commons-lang/ChangeLog b/dev-java/commons-lang/ChangeLog
index 6549a4b7b590..d77ab44a4d49 100644
--- a/dev-java/commons-lang/ChangeLog
+++ b/dev-java/commons-lang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-lang
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.21 2004/09/18 10:36:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.22 2004/10/16 17:07:30 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-lang-2.0-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   18 Sep 2004; Thomas Matthijs <axxo@gentoo.org> commons-lang-2.0-r1.ebuild:
   dropped jikes support, since it cannot pass the junit tests then, bug 64483
diff --git a/dev-java/commons-lang/commons-lang-2.0-r1.ebuild b/dev-java/commons-lang/commons-lang-2.0-r1.ebuild
index e82f00a80a13..b6ef2531a282 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.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/commons-lang/commons-lang-2.0-r1.ebuild,v 1.9 2004/09/18 10:36:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r1.ebuild,v 1.10 2004/10/16 17:07:30 axxo Exp $
 
 inherit java-pkg
 
@@ -38,5 +38,5 @@ src_install() {
 	java-pkg_dojar dist/*.jar
 	dodoc RELEASE-NOTES.txt
 	dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/commons-launcher/ChangeLog b/dev-java/commons-launcher/ChangeLog
index ee863374391f..2a59f4152ab0 100644
--- a/dev-java/commons-launcher/ChangeLog
+++ b/dev-java/commons-launcher/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-launcher
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.4 2004/06/24 22:22:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.5 2004/10/16 17:07:50 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-launcher-0.9.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-launcher-0.9.ebuild:
   Stable on x86. Fixes according to #45398
diff --git a/dev-java/commons-launcher/commons-launcher-0.9.ebuild b/dev-java/commons-launcher/commons-launcher-0.9.ebuild
index a1a77d1c7389..28948b6744f1 100644
--- a/dev-java/commons-launcher/commons-launcher-0.9.ebuild
+++ b/dev-java/commons-launcher/commons-launcher-0.9.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/commons-launcher/commons-launcher-0.9.ebuild,v 1.4 2004/06/24 22:22:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-0.9.ebuild,v 1.5 2004/10/16 17:07:50 axxo Exp $
 
 inherit java-pkg
 
@@ -26,5 +26,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar dist/bin/*.jar || die "java-pkg_dojar died"
 	dohtml *.html
-	use doc && dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index d5f54be5c649..fe3bfb82427f 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.22 2004/09/10 19:47:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.23 2004/10/16 17:08:14 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-logging-1.0.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> commons-logging-1.0.4.ebuild:
   changed dependenciess to ant-core
diff --git a/dev-java/commons-logging/commons-logging-1.0.4.ebuild b/dev-java/commons-logging/commons-logging-1.0.4.ebuild
index 3d3d6cbe6791..aa90ba94a1f0 100644
--- a/dev-java/commons-logging/commons-logging-1.0.4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.0.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/commons-logging/commons-logging-1.0.4.ebuild,v 1.8 2004/10/12 18:17:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4.ebuild,v 1.9 2004/10/16 17:08:14 axxo Exp $
 
 inherit java-pkg
 
@@ -42,5 +42,5 @@ src_install() {
 
 	dodoc RELEASE-NOTES.txt
 	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog
index 8eb70093c0e6..f46027fb6d6a 100644
--- a/dev-java/commons-modeler/ChangeLog
+++ b/dev-java/commons-modeler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-modeler
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.3 2004/06/24 22:23:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.4 2004/10/16 17:08:36 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-modeler-1.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-modeler-1.1.ebuild:
   Stable on x86. Fixes according to #45398
diff --git a/dev-java/commons-modeler/commons-modeler-1.1.ebuild b/dev-java/commons-modeler/commons-modeler-1.1.ebuild
index f6d882c7f370..02280a6c856f 100644
--- a/dev-java/commons-modeler/commons-modeler-1.1.ebuild
+++ b/dev-java/commons-modeler/commons-modeler-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/commons-modeler/commons-modeler-1.1.ebuild,v 1.3 2004/06/24 22:23:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1.ebuild,v 1.4 2004/10/16 17:08:36 axxo Exp $
 
 inherit java-pkg
 
@@ -43,5 +43,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar dist/${PN}.jar  || die "Unable to install"
 	dodoc LICENSE.txt RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog
index 542d716c7026..2a389fa83101 100644
--- a/dev-java/commons-net/ChangeLog
+++ b/dev-java/commons-net/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-net
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.16 2004/10/16 08:40:19 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.17 2004/10/16 17:08:56 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-net-1.2.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> commons-net-1.2.2.ebuild:
   Stable on amd64.
diff --git a/dev-java/commons-net/commons-net-1.2.2.ebuild b/dev-java/commons-net/commons-net-1.2.2.ebuild
index 15232f44ce45..3a19706dcc3b 100644
--- a/dev-java/commons-net/commons-net-1.2.2.ebuild
+++ b/dev-java/commons-net/commons-net-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/commons-net/commons-net-1.2.2.ebuild,v 1.9 2004/10/16 08:40:19 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2.ebuild,v 1.10 2004/10/16 17:08:56 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -34,5 +34,5 @@ src_compile() {
 src_install() {
 	mv ${S}/target/${P}-dev.jar ${S}/target/${PN}.jar
 	java-pkg_dojar target/${PN}.jar || die "died on java-pkg_dojar"
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index 57601c34ae37..6067a21b737e 100644
--- a/dev-java/commons-pool/ChangeLog
+++ b/dev-java/commons-pool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-pool
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.17 2004/09/28 18:18:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.18 2004/10/16 17:09:15 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> commons-pool-1.1.ebuild,
+  commons-pool-1.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *commons-pool-1.2 (28 Sep 2004)
 
diff --git a/dev-java/commons-pool/commons-pool-1.1.ebuild b/dev-java/commons-pool/commons-pool-1.1.ebuild
index 23c193a6ef5d..c32eb2406a1b 100644
--- a/dev-java/commons-pool/commons-pool-1.1.ebuild
+++ b/dev-java/commons-pool/commons-pool-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/commons-pool/commons-pool-1.1.ebuild,v 1.7 2004/06/24 22:23:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.1.ebuild,v 1.8 2004/10/16 17:09:15 axxo Exp $
 
 inherit java-pkg
 
@@ -47,6 +47,6 @@ src_install () {
 	dohtml STATUS.html PROPOSAL.html
 
 	if use doc ; then
-		dohtml -r dist/docs/*
+		java-pkg_dohtml -r dist/docs/*
 	fi
 }
diff --git a/dev-java/commons-pool/commons-pool-1.2.ebuild b/dev-java/commons-pool/commons-pool-1.2.ebuild
index 0121b0ef5087..a7c91c55e698 100644
--- a/dev-java/commons-pool/commons-pool-1.2.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.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/commons-pool/commons-pool-1.2.ebuild,v 1.1 2004/09/28 18:18:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.2.ebuild,v 1.2 2004/10/16 17:09:15 axxo Exp $
 
 inherit java-pkg
 
@@ -47,5 +47,5 @@ src_install () {
 	dodoc README.txt
 	dohtml STATUS.html PROPOSAL.html
 
-	use doc && 	dohtml -r dist/docs/*
+	use doc && 	java-pkg_dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-primitives/ChangeLog b/dev-java/commons-primitives/ChangeLog
index 51fa19c7fde9..1ae8b9789e57 100644
--- a/dev-java/commons-primitives/ChangeLog
+++ b/dev-java/commons-primitives/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-primitives
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/ChangeLog,v 1.5 2004/09/29 23:53:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/ChangeLog,v 1.6 2004/10/16 17:09:34 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-primitives-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> commons-primitives-1.0.ebuild:
   Marking stable on x86
diff --git a/dev-java/commons-primitives/commons-primitives-1.0.ebuild b/dev-java/commons-primitives/commons-primitives-1.0.ebuild
index 5e4785edfe6d..d69d85fbd52e 100644
--- a/dev-java/commons-primitives/commons-primitives-1.0.ebuild
+++ b/dev-java/commons-primitives/commons-primitives-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/commons-primitives/commons-primitives-1.0.ebuild,v 1.3 2004/06/27 16:56:03 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/commons-primitives-1.0.ebuild,v 1.4 2004/10/16 17:09:34 axxo Exp $
 
 inherit java-pkg
 
@@ -34,5 +34,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/${PN}-${PV}.jar
 
-	use doc && dohtml -r target/docs/api/*
+	use doc && java-pkg_dohtml -r target/docs/api/*
 }
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index e0fe299d02a0..a967d294aa73 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.14 2004/09/10 13:25:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.15 2004/10/16 17:09:53 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-validator-1.0.2-r3.ebuild, commons-validator-1.1.3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *commons-validator-1.1.3 (10 Sep 2004)
 
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
index a3cdcf220e66..520245e4b70b 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r3.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/commons-validator/commons-validator-1.0.2-r3.ebuild,v 1.5 2004/09/10 13:25:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild,v 1.6 2004/10/16 17:09:53 axxo Exp $
 
 inherit java-pkg
 
@@ -54,7 +54,7 @@ src_install() {
 
 	cd ${S}
 	java-pkg_dojar target/${PN}.jar
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 	dohtml PROPOSAL.html STATUS.html
 	dodoc RELEASE-NOTES.txt
 }
diff --git a/dev-java/commons-validator/commons-validator-1.1.3.ebuild b/dev-java/commons-validator/commons-validator-1.1.3.ebuild
index 51b79b7a03a4..057f7e7cd935 100644
--- a/dev-java/commons-validator/commons-validator-1.1.3.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.3.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/commons-validator/commons-validator-1.1.3.ebuild,v 1.2 2004/09/10 13:41:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.3.ebuild,v 1.3 2004/10/16 17:09:53 axxo Exp $
 
 inherit java-pkg
 
@@ -51,7 +51,7 @@ src_compile() {
 src_install() {
 	cd ${S}
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 	dohtml PROPOSAL.html STATUS.html
 	dodoc LICENSE.txt
 }
diff --git a/dev-java/crimson/ChangeLog b/dev-java/crimson/ChangeLog
index 3b57086d42c2..3350a26d85cd 100644
--- a/dev-java/crimson/ChangeLog
+++ b/dev-java/crimson/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/crimson
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/ChangeLog,v 1.5 2004/08/24 04:05:09 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/ChangeLog,v 1.6 2004/10/16 17:10:12 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> crimson-1.1.3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> crimson-1.1.3.ebuild:
   Marking x86
diff --git a/dev-java/crimson/crimson-1.1.3.ebuild b/dev-java/crimson/crimson-1.1.3.ebuild
index 13f4d00c5c9c..571c1bbb6349 100644
--- a/dev-java/crimson/crimson-1.1.3.ebuild
+++ b/dev-java/crimson/crimson-1.1.3.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/crimson/crimson-1.1.3.ebuild,v 1.5 2004/08/24 04:05:09 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/crimson-1.1.3.ebuild,v 1.6 2004/10/16 17:10:12 axxo Exp $
 
 inherit java-pkg
 
@@ -21,6 +21,6 @@ src_install() {
 	dojar build/crimson.jar
 	dodoc build/ChangeLog
 	dohtml build/README.html
-	dohtml -r build/docs
-	dohtml -r -A class,java,xml build/examples
+	java-pkg_dohtml -r build/docs
+	java-pkg_dohtml -r -A class,java,xml build/examples
 }
diff --git a/dev-java/cvslib-bin/ChangeLog b/dev-java/cvslib-bin/ChangeLog
index 92a2f22065fe..da47789a354e 100644
--- a/dev-java/cvslib-bin/ChangeLog
+++ b/dev-java/cvslib-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/cvslib-bin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cvslib-bin/ChangeLog,v 1.1 2004/09/17 09:28:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cvslib-bin/ChangeLog,v 1.2 2004/10/16 17:10:32 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> cvslib-bin-3.5.ebuild,
+  cvslib-bin-3.6.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *cvslib-bin-3.5 (16 Sep 2004)
 
diff --git a/dev-java/cvslib-bin/cvslib-bin-3.5.ebuild b/dev-java/cvslib-bin/cvslib-bin-3.5.ebuild
index 6e9c606ef625..a61645b86b79 100644
--- a/dev-java/cvslib-bin/cvslib-bin-3.5.ebuild
+++ b/dev-java/cvslib-bin/cvslib-bin-3.5.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/cvslib-bin/cvslib-bin-3.5.ebuild,v 1.1 2004/09/17 09:28:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cvslib-bin/cvslib-bin-3.5.ebuild,v 1.2 2004/10/16 17:10:32 axxo Exp $
 
 inherit java-pkg
 
@@ -27,5 +27,5 @@ src_compile() { :; }
 
 src_install() {
 	java-pkg_dojar cvslib.jar
-	use doc && dohtml -r javadoc/
+	use doc && java-pkg_dohtml -r javadoc/
 }
diff --git a/dev-java/cvslib-bin/cvslib-bin-3.6.ebuild b/dev-java/cvslib-bin/cvslib-bin-3.6.ebuild
index 5d48548fbe72..54c23066bcd9 100644
--- a/dev-java/cvslib-bin/cvslib-bin-3.6.ebuild
+++ b/dev-java/cvslib-bin/cvslib-bin-3.6.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/cvslib-bin/cvslib-bin-3.6.ebuild,v 1.1 2004/09/17 09:28:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cvslib-bin/cvslib-bin-3.6.ebuild,v 1.2 2004/10/16 17:10:32 axxo Exp $
 
 inherit java-pkg
 
@@ -28,5 +28,5 @@ src_compile() { :; }
 src_install() {
 	mv cvslib_36.jar cvslib.jar
 	java-pkg_dojar cvslib.jar
-	use doc && dohtml -r javadoc/
+	use doc && java-pkg_dohtml -r javadoc/
 }
diff --git a/dev-java/dbconnectionbroker-bin/ChangeLog b/dev-java/dbconnectionbroker-bin/ChangeLog
index 89260b9794d3..e133af644dbd 100644
--- a/dev-java/dbconnectionbroker-bin/ChangeLog
+++ b/dev-java/dbconnectionbroker-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/dbconnectionbroker-bin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbconnectionbroker-bin/ChangeLog,v 1.2 2004/09/05 07:04:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbconnectionbroker-bin/ChangeLog,v 1.3 2004/10/16 17:10:51 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  dbconnectionbroker-bin-1.0.13.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/dbconnectionbroker-bin/dbconnectionbroker-bin-1.0.13.ebuild b/dev-java/dbconnectionbroker-bin/dbconnectionbroker-bin-1.0.13.ebuild
index 92fcef1a91fe..1ff010e30721 100644
--- a/dev-java/dbconnectionbroker-bin/dbconnectionbroker-bin-1.0.13.ebuild
+++ b/dev-java/dbconnectionbroker-bin/dbconnectionbroker-bin-1.0.13.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/dbconnectionbroker-bin/dbconnectionbroker-bin-1.0.13.ebuild,v 1.1 2004/07/30 19:35:50 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbconnectionbroker-bin/dbconnectionbroker-bin-1.0.13.ebuild,v 1.2 2004/10/16 17:10:51 axxo Exp $
 
 inherit java-pkg
 
@@ -22,5 +22,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar DbConnectionBroker.jar
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/dbunit-bin/ChangeLog b/dev-java/dbunit-bin/ChangeLog
index 7dc6bfdf8c75..91d3a8da71b3 100644
--- a/dev-java/dbunit-bin/ChangeLog
+++ b/dev-java/dbunit-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/dbunit-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit-bin/ChangeLog,v 1.4 2004/09/07 06:41:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit-bin/ChangeLog,v 1.5 2004/10/16 17:11:09 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> dbunit-bin-2.0.ebuild,
+  dbunit-bin-2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *dbunit-bin-2.1 (07 Sep 2004)
 
diff --git a/dev-java/dbunit-bin/dbunit-bin-2.0.ebuild b/dev-java/dbunit-bin/dbunit-bin-2.0.ebuild
index 63d1f3a7507f..4b4b2f128ce1 100644
--- a/dev-java/dbunit-bin/dbunit-bin-2.0.ebuild
+++ b/dev-java/dbunit-bin/dbunit-bin-2.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/dbunit-bin/dbunit-bin-2.0.ebuild,v 1.3 2004/09/07 06:41:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit-bin/dbunit-bin-2.0.ebuild,v 1.4 2004/10/16 17:11:09 axxo Exp $
 
 inherit java-pkg
 
@@ -23,5 +23,5 @@ src_compile() {	:; }
 src_install() {
 	mv ${S}/${MY_P}.jar ${S}/${MY_PN}.jar
 	java-pkg_dojar ${MY_PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/dbunit-bin/dbunit-bin-2.1.ebuild b/dev-java/dbunit-bin/dbunit-bin-2.1.ebuild
index 6061bcf25e6c..7aae80b823f6 100644
--- a/dev-java/dbunit-bin/dbunit-bin-2.1.ebuild
+++ b/dev-java/dbunit-bin/dbunit-bin-2.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/dbunit-bin/dbunit-bin-2.1.ebuild,v 1.1 2004/09/07 06:41:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit-bin/dbunit-bin-2.1.ebuild,v 1.2 2004/10/16 17:11:09 axxo Exp $
 
 inherit java-pkg
 
@@ -23,5 +23,5 @@ src_compile() {	:; }
 src_install() {
 	mv ${S}/${MY_P}.jar ${S}/${MY_PN}.jar
 	java-pkg_dojar ${MY_PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 0f2d9c80fa89..0d7750598d7d 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.12 2004/06/27 17:33:05 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.13 2004/10/16 17:11:27 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> dom4j-1.4-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> dom4j-1.4-r1.ebuild:
   Marking stable on ppc
diff --git a/dev-java/dom4j/dom4j-1.4-r1.ebuild b/dev-java/dom4j/dom4j-1.4-r1.ebuild
index bfef0256bef8..a6e2085bce02 100644
--- a/dev-java/dom4j/dom4j-1.4-r1.ebuild
+++ b/dev-java/dom4j/dom4j-1.4-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/dom4j/dom4j-1.4-r1.ebuild,v 1.5 2004/09/17 13:54:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.4-r1.ebuild,v 1.6 2004/10/16 17:11:27 axxo Exp $
 
 inherit java-pkg
 
@@ -22,5 +22,5 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/dom4j-${PV}
 	java-pkg_dojar build/${PN}.jar
-	use doc && dohtml -r build/doc/*
+	use doc && java-pkg_dohtml -r build/doc/*
 }
diff --git a/dev-java/ecs/ChangeLog b/dev-java/ecs/ChangeLog
index 210a7e83a0a5..6ee1e473963e 100644
--- a/dev-java/ecs/ChangeLog
+++ b/dev-java/ecs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ecs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.4 2004/06/24 22:25:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.5 2004/10/16 17:11:46 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> ecs-1.4.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ecs-1.4.1.ebuild:
   Fixes according to #45398
diff --git a/dev-java/ecs/ecs-1.4.1.ebuild b/dev-java/ecs/ecs-1.4.1.ebuild
index 9ad6ae0a9091..83d67870246d 100644
--- a/dev-java/ecs/ecs-1.4.1.ebuild
+++ b/dev-java/ecs/ecs-1.4.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/ecs/ecs-1.4.1.ebuild,v 1.6 2004/06/24 22:25:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ecs-1.4.1.ebuild,v 1.7 2004/10/16 17:11:46 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Java library to generate markup language text such as HTML and XML."
 HOMEPAGE="http://jakarta.apache.org/ecs"
@@ -20,7 +22,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar bin/*.jar
+	java-pkg_dojar bin/*.jar
 	dodoc AUTHORS  COPYING  ChangeLog  INSTALL  README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/edtftpj/ChangeLog b/dev-java/edtftpj/ChangeLog
index 941d90fa3705..daf5cf1fe784 100644
--- a/dev-java/edtftpj/ChangeLog
+++ b/dev-java/edtftpj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/edtftpj
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/ChangeLog,v 1.4 2004/08/24 04:08:02 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/ChangeLog,v 1.5 2004/10/16 17:12:04 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> edtftpj-1.4.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *edtftpj-1.4.2 (24 Aug 2004)
 
diff --git a/dev-java/edtftpj/edtftpj-1.4.2.ebuild b/dev-java/edtftpj/edtftpj-1.4.2.ebuild
index 7e2c570ffdf7..ff52d97ed0af 100644
--- a/dev-java/edtftpj/edtftpj-1.4.2.ebuild
+++ b/dev-java/edtftpj/edtftpj-1.4.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/edtftpj/edtftpj-1.4.2.ebuild,v 1.1 2004/08/24 04:08:02 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.2.ebuild,v 1.2 2004/10/16 17:12:04 axxo Exp $
 
 inherit java-pkg
 
@@ -26,7 +26,7 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	use doc && dohtml -r build/doc/api
+	use doc && java-pkg_dohtml -r build/doc/api
 	dodoc doc/*.TXT
 	insinto /usr/share/doc/${PF}
 	doins doc/*.pdf
diff --git a/dev-java/fastutil/ChangeLog b/dev-java/fastutil/ChangeLog
index 97db58616672..9bec19da6ade 100644
--- a/dev-java/fastutil/ChangeLog
+++ b/dev-java/fastutil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fastutil
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/ChangeLog,v 1.6 2004/06/27 17:36:13 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/ChangeLog,v 1.7 2004/10/16 17:12:23 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fastutil-4.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> fastutil-4.1.ebuild:
   Marking stable on ppc
diff --git a/dev-java/fastutil/fastutil-4.1.ebuild b/dev-java/fastutil/fastutil-4.1.ebuild
index e638064d50d8..c68872ea49bb 100644
--- a/dev-java/fastutil/fastutil-4.1.ebuild
+++ b/dev-java/fastutil/fastutil-4.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/fastutil/fastutil-4.1.ebuild,v 1.6 2004/06/27 17:36:13 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.1.ebuild,v 1.7 2004/10/16 17:12:23 axxo Exp $
 
 inherit java-pkg
 
@@ -27,7 +27,7 @@ src_compile() {
 src_install() {
 	mv ${P}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	dodoc CHANGES README
 }
 
diff --git a/dev-java/fesi-bin/ChangeLog b/dev-java/fesi-bin/ChangeLog
index 15775c4af1f6..533d1285ae30 100644
--- a/dev-java/fesi-bin/ChangeLog
+++ b/dev-java/fesi-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fesi-bin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/ChangeLog,v 1.2 2004/09/05 07:06:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/ChangeLog,v 1.3 2004/10/16 17:12:42 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fesi-bin-1.1.5.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/fesi-bin/fesi-bin-1.1.5.ebuild b/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild
index be05f497b690..83f492d3ee01 100644
--- a/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild
+++ b/dev-java/fesi-bin/fesi-bin-1.1.5.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/fesi-bin/fesi-bin-1.1.5.ebuild,v 1.1 2004/07/30 19:46:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild,v 1.2 2004/10/16 17:12:42 axxo Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ src_install() {
 	java-pkg_dojar fesi.jar
 	dodoc Readme.txt
 	if use doc ; then
-		dohtml -r doc/html/*
+		java-pkg_dohtml -r doc/html/*
 		cp -r examples ${D}/usr/share/${PN/-bin}
 		cp -r tests ${D}/usr/share/${PN/-bin}
 	fi
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 0138330bc0aa..9fef18c79dc1 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.8 2004/10/16 08:44:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.9 2004/10/16 17:13:01 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fop-0.20.5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> fop-0.20.5.ebuild:
   Stable on amd64.
diff --git a/dev-java/fop/fop-0.20.5.ebuild b/dev-java/fop/fop-0.20.5.ebuild
index d03ce6869c32..2005228c3c5b 100644
--- a/dev-java/fop/fop-0.20.5.ebuild
+++ b/dev-java/fop/fop-0.20.5.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/fop/fop-0.20.5.ebuild,v 1.9 2004/10/16 08:44:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5.ebuild,v 1.10 2004/10/16 17:13:01 axxo Exp $
 
 inherit java-pkg
 
@@ -43,6 +43,6 @@ src_install () {
 		dohtml ReleaseNotes.html
 		dodir /usr/share/doc/${P}
 		cp -a examples ${D}/usr/share/doc/${P}
-		dohtml -r build/javadocs
+		java-pkg_dohtml -r build/javadocs
 	fi
 }
diff --git a/dev-java/fscript/ChangeLog b/dev-java/fscript/ChangeLog
index 7fcf99c66fab..0cd3c2254260 100644
--- a/dev-java/fscript/ChangeLog
+++ b/dev-java/fscript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/fscript
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/ChangeLog,v 1.4 2004/06/24 22:26:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/ChangeLog,v 1.5 2004/10/16 17:13:20 axxo Exp $
+
+*fscript-1.15 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fscript-1.14.ebuild,
+  fscript-1.15.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   21 May 2004; Chris Aniszczyk <zx@gentoo.org> :
   Version bump
diff --git a/dev-java/fscript/fscript-1.14.ebuild b/dev-java/fscript/fscript-1.14.ebuild
index 649fb28c0d42..bc8c7dac1645 100644
--- a/dev-java/fscript/fscript-1.14.ebuild
+++ b/dev-java/fscript/fscript-1.14.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/fscript/fscript-1.14.ebuild,v 1.3 2004/06/24 22:26:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/fscript-1.14.ebuild,v 1.4 2004/10/16 17:13:20 axxo Exp $
 
 inherit java-pkg
 
@@ -25,5 +25,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar *.jar
 	dodoc CREDITS README VERSION
-	use doc && dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
+	use doc && java-pkg_dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
 }
diff --git a/dev-java/fscript/fscript-1.15.ebuild b/dev-java/fscript/fscript-1.15.ebuild
index 8e4a0e4ed228..807b636b6dac 100644
--- a/dev-java/fscript/fscript-1.15.ebuild
+++ b/dev-java/fscript/fscript-1.15.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/fscript/fscript-1.15.ebuild,v 1.2 2004/06/24 22:26:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/fscript-1.15.ebuild,v 1.3 2004/10/16 17:13:20 axxo Exp $
 
 inherit java-pkg
 
@@ -26,5 +26,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar *.jar
 	dodoc CREDITS README VERSION
-	use doc && dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
+	use doc && java-pkg_dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
 }
diff --git a/dev-java/gnu-activation/ChangeLog b/dev-java/gnu-activation/ChangeLog
index 1831d8b81a33..2b4fd981e9f5 100644
--- a/dev-java/gnu-activation/ChangeLog
+++ b/dev-java/gnu-activation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-activation
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-activation/ChangeLog,v 1.6 2004/09/29 23:55:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-activation/ChangeLog,v 1.7 2004/10/16 17:13:39 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-activation-20040331.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> gnu-activation-20040331.ebuild:
   Marking x86
diff --git a/dev-java/gnu-activation/gnu-activation-20040331.ebuild b/dev-java/gnu-activation/gnu-activation-20040331.ebuild
index e2bd4b0952fb..f36e79e0a35a 100644
--- a/dev-java/gnu-activation/gnu-activation-20040331.ebuild
+++ b/dev-java/gnu-activation/gnu-activation-20040331.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/gnu-activation/gnu-activation-20040331.ebuild,v 1.4 2004/08/24 04:12:29 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-activation/gnu-activation-20040331.ebuild,v 1.5 2004/10/16 17:13:39 axxo Exp $
 
 inherit java-pkg
 
@@ -28,6 +28,6 @@ src_install() {
 	java-pkg_dojar activation.jar
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/gnu-classpath-inetlib/ChangeLog b/dev-java/gnu-classpath-inetlib/ChangeLog
index d8c07adc44a1..faf63c392dcc 100644
--- a/dev-java/gnu-classpath-inetlib/ChangeLog
+++ b/dev-java/gnu-classpath-inetlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-classpath-inetlib
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.7 2004/09/29 23:51:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.8 2004/10/16 17:13:58 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-classpath-inetlib-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Aug 2004; David Holm <dholm@gentoo.org> gnu-classpath-inetlib-1.0.ebuild:
   Added to ~ppc.
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild
index 57fd42bdfc66..e4d54dae0818 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-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/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild,v 1.2 2004/08/01 12:36:53 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild,v 1.3 2004/10/16 17:13:58 axxo Exp $
 
 inherit java-pkg
 
@@ -56,6 +56,6 @@ src_install() {
 	einstall || die
 	rm -rf ${D}/usr/share/java
 	java-pkg_dojar inetlib.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	dodoc AUTHORS COPYING NEWS README
 }
diff --git a/dev-java/gnu-crypto/ChangeLog b/dev-java/gnu-crypto/ChangeLog
index a13f8444cacf..eed8724690be 100644
--- a/dev-java/gnu-crypto/ChangeLog
+++ b/dev-java/gnu-crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-crypto
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.5 2004/09/29 23:56:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.6 2004/10/16 17:14:17 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> gnu-crypto-2.0.1.ebuild:
   Marking x86
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild
index 012dd2142e19..2298cc13fa4d 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.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/gnu-crypto/gnu-crypto-2.0.1.ebuild,v 1.6 2004/08/24 04:15:23 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild,v 1.7 2004/10/16 17:14:17 axxo Exp $
 
 inherit java-pkg
 
@@ -36,7 +36,7 @@ src_install() {
 	java-pkg_dojar security/javax-security.jar
 
 	if use doc ; then
-		dohtml -r api/*
+		java-pkg_dohtml -r api/*
 	fi
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
diff --git a/dev-java/gnu-javamail/ChangeLog b/dev-java/gnu-javamail/ChangeLog
index e3b27f3f517d..153c61cad8cf 100644
--- a/dev-java/gnu-javamail/ChangeLog
+++ b/dev-java/gnu-javamail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-javamail
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.7 2004/09/29 23:58:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.8 2004/10/16 17:14:36 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-javamail-20040331.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   javamail-20030331.ebuild: Fixed dep on gnu-classpath-inetlib.
diff --git a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild b/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
index 9dbc26801e9b..27f00996ebc3 100644
--- a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-20040331.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/gnu-javamail/gnu-javamail-20040331.ebuild,v 1.6 2004/08/01 10:43:26 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild,v 1.7 2004/10/16 17:14:36 axxo Exp $
 
 inherit java-pkg
 
@@ -41,5 +41,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar gnumail.jar gnumail-providers.jar || die
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README.*
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/gnu-jaxp/ChangeLog b/dev-java/gnu-jaxp/ChangeLog
index aca777e8949d..eb4c785bb2ee 100644
--- a/dev-java/gnu-jaxp/ChangeLog
+++ b/dev-java/gnu-jaxp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-jaxp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/ChangeLog,v 1.5 2004/09/22 22:00:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/ChangeLog,v 1.6 2004/10/16 17:14:56 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-jaxp-1.0_beta1-r1.ebuild, gnu-jaxp-1.0_beta1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *gnu-jaxp-1.0_beta1-r1 (23 Sep 2004)
 
diff --git a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild
index 19d4aad94d43..69fd3e11f80c 100644
--- a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild
+++ b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-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/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild,v 1.1 2004/09/22 22:00:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild,v 1.2 2004/10/16 17:14:56 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -26,5 +26,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar gnujaxp.jar || die "Unable to Install"
 	dodoc README
-	use doc && dohtml -r apidoc/*
+	use doc && java-pkg_dohtml -r apidoc/*
 }
diff --git a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild
index 0a8d373c24b0..544345a3e863 100644
--- a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild
+++ b/dev-java/gnu-jaxp/gnu-jaxp-1.0_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/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild,v 1.6 2004/06/24 22:27:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild,v 1.7 2004/10/16 17:14:56 axxo Exp $
 
 inherit java-pkg
 
@@ -21,5 +21,5 @@ src_compile() { :; }
 src_install () {
 	java-pkg_dojar gnujaxp.jar || die "Unable to Install"
 	dodoc README
-	use doc && dohtml -r apidoc/*
+	use doc && java-pkg_dohtml -r apidoc/*
 }
diff --git a/dev-java/gnu-regexp/ChangeLog b/dev-java/gnu-regexp/ChangeLog
index 7f7c3dfee779..f4359df81e66 100644
--- a/dev-java/gnu-regexp/ChangeLog
+++ b/dev-java/gnu-regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-regexp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/ChangeLog,v 1.6 2004/06/24 22:28:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/ChangeLog,v 1.7 2004/10/16 17:15:14 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> gnu-regexp-1.1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> gnu-regexp-1.1.4.ebuild:
   Header fix
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
index 1f0082f6bb8f..7ec3379dfbb7 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.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/gnu-regexp/gnu-regexp-1.1.4.ebuild,v 1.7 2004/07/14 01:58:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild,v 1.8 2004/10/16 17:15:14 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="GNU regular expression package for Java"
 HOMEPAGE="http://www.cacas.org/java/gnu/regexp/"
@@ -13,18 +15,14 @@ DEPEND=">=virtual/jdk-1.2"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
 src_compile() {
 	patch src/Makefile ${FILESDIR}/${PV}/Makefile.diff
 	cd src
-	make
+	make || die "failed too build"
 }
 
 src_install () {
-	dojar lib/gnu-regexp-${PV}.jar
+	java-pkg_dojar lib/gnu-regexp-${PV}.jar
 	dodoc COPYING.LIB README TODO
-	dohtml docs/* -r
+	java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index bc102b9ea62b..adaea623c789 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.7 2004/09/29 23:53:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.8 2004/10/16 17:15:35 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> groovy-1.0_beta4-r1.ebuild,
+  groovy-1.0_beta4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   08 Aug 2004; Stuart Herbert <stuart@gentoo.org> groovy-1.0_beta4-r1.ebuild,
   groovy-1.0_beta4.ebuild:
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
index 5d2da49c648f..7ec642f7ae0f 100644
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4-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/groovy/groovy-1.0_beta4-r1.ebuild,v 1.4 2004/08/08 21:18:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.5 2004/10/16 17:15:35 axxo Exp $
 
 inherit java-pkg
 
@@ -109,7 +109,7 @@ src_install() {
 
 	# Install API documentation
 	if use doc ; then
-		dohtml -r dist/docs/api
+		java-pkg_dohtml -r dist/docs/api
 	fi
 
 	# Install configuration files
diff --git a/dev-java/groovy/groovy-1.0_beta4.ebuild b/dev-java/groovy/groovy-1.0_beta4.ebuild
index 866972ff50b5..5f044cb0fa5c 100644
--- a/dev-java/groovy/groovy-1.0_beta4.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4.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/groovy/groovy-1.0_beta4.ebuild,v 1.3 2004/08/08 21:18:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4.ebuild,v 1.4 2004/10/16 17:15:35 axxo Exp $
 
 inherit java-pkg
 
@@ -63,6 +63,6 @@ src_install() {
 	dodoc LICENSE.txt
 	java-pkg_dojar target/groovy-1.0-beta-2.jar
 	if use doc ; then
-		dohtml -r dist/docs/api
+		java-pkg_dohtml -r dist/docs/api
 	fi
 }
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 0271bf07fde2..2fe6a7dd5ab2 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.11 2004/08/11 14:47:35 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.12 2004/10/16 17:15:55 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> hibernate-2.1.4.ebuild,
+  hibernate-2.1.6.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *hibernate-2.1.6 (11 Aug 2004)
 
diff --git a/dev-java/hibernate/hibernate-2.1.4.ebuild b/dev-java/hibernate/hibernate-2.1.4.ebuild
index 820e5b6646fa..398f41df9d26 100644
--- a/dev-java/hibernate/hibernate-2.1.4.ebuild
+++ b/dev-java/hibernate/hibernate-2.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/hibernate/hibernate-2.1.4.ebuild,v 1.6 2004/07/09 03:23:31 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.4.ebuild,v 1.7 2004/10/16 17:15:55 axxo Exp $
 
 inherit java-pkg
 
@@ -31,5 +31,5 @@ src_install() {
 	dodoc *.txt lib/c3p0*.txt
 	insinto /usr/share/doc/${P}/sample
 	doins src/*.xml src/*.properties src/*.ccf src/META-INF/ra.xml
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/hibernate/hibernate-2.1.6.ebuild b/dev-java/hibernate/hibernate-2.1.6.ebuild
index bebe174c78bb..7bd8b2d2620c 100644
--- a/dev-java/hibernate/hibernate-2.1.6.ebuild
+++ b/dev-java/hibernate/hibernate-2.1.6.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/hibernate/hibernate-2.1.6.ebuild,v 1.1 2004/08/11 14:47:35 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.6.ebuild,v 1.2 2004/10/16 17:15:55 axxo Exp $
 
 inherit java-pkg
 
@@ -31,5 +31,5 @@ src_install() {
 	dodoc *.txt lib/c3p0*.txt
 	insinto /usr/share/doc/${P}/sample
 	doins src/*.xml src/*.properties src/*.ccf src/META-INF/ra.xml
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/htmlparser/ChangeLog b/dev-java/htmlparser/ChangeLog
index 259857a3670f..185a1e424144 100644
--- a/dev-java/htmlparser/ChangeLog
+++ b/dev-java/htmlparser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/htmlparser
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/ChangeLog,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/ChangeLog,v 1.2 2004/10/16 17:16:15 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> htmlparser-1.3.ebuild,
+  htmlparser-1.4.20040104.ebuild, htmlparser-1.4.20040727.ebuild,
+  htmlparser-1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *htmlparser-1.4 (17 Sep 2004)
 
diff --git a/dev-java/htmlparser/htmlparser-1.3.ebuild b/dev-java/htmlparser/htmlparser-1.3.ebuild
index 35b92a8cd6ad..6288e8adfa43 100644
--- a/dev-java/htmlparser/htmlparser-1.3.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.3.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/htmlparser/htmlparser-1.3.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.3.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar release/${MY_P}/lib/htmlparser.jar
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild b/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild
index 76d7d8b4d3ad..40ae473cb4e9 100644
--- a/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4.20040104.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/htmlparser/htmlparser-1.4.20040104.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/{htmllexer.jar,htmlparser.jar}
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild b/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild
index b409bf9eca2c..760d437e3047 100644
--- a/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4.20040727.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/htmlparser/htmlparser-1.4.20040727.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/{htmllexer.jar,htmlparser.jar}
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/htmlparser/htmlparser-1.4.ebuild b/dev-java/htmlparser/htmlparser-1.4.ebuild
index 5f64fb52ec34..c7b4c833f26c 100644
--- a/dev-java/htmlparser/htmlparser-1.4.ebuild
+++ b/dev-java/htmlparser/htmlparser-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/htmlparser/htmlparser-1.4.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/{htmllexer.jar,htmlparser.jar}
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 1fc3a79dd38d..c153c8ab0f23 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icu4j
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.1 2004/09/19 14:51:40 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.2 2004/10/16 17:16:34 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> icu4j-3.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *icu4j-3.0 (19 Sep 2004)
 
diff --git a/dev-java/icu4j/icu4j-3.0.ebuild b/dev-java/icu4j/icu4j-3.0.ebuild
index 4eb0f6134b9e..83b3655b8584 100644
--- a/dev-java/icu4j/icu4j-3.0.ebuild
+++ b/dev-java/icu4j/icu4j-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/icu4j/icu4j-3.0.ebuild,v 1.1 2004/09/19 14:51:40 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.0.ebuild,v 1.2 2004/10/16 17:16:34 axxo Exp $
 
 inherit java-pkg
 
@@ -36,5 +36,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${PN}.jar
 
-	use doc && dohtml -r readme.html docs/*
+	use doc && java-pkg_dohtml -r readme.html docs/*
 }
diff --git a/dev-java/infobus-bin/ChangeLog b/dev-java/infobus-bin/ChangeLog
index 45a4ad128cad..b6620ef45284 100644
--- a/dev-java/infobus-bin/ChangeLog
+++ b/dev-java/infobus-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/infobus-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus-bin/ChangeLog,v 1.2 2004/09/05 07:06:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus-bin/ChangeLog,v 1.3 2004/10/16 17:16:52 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> infobus-bin-1.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/infobus-bin/infobus-bin-1.2.ebuild b/dev-java/infobus-bin/infobus-bin-1.2.ebuild
index 589dfe6bebb9..8786952981b9 100644
--- a/dev-java/infobus-bin/infobus-bin-1.2.ebuild
+++ b/dev-java/infobus-bin/infobus-bin-1.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/infobus-bin/infobus-bin-1.2.ebuild,v 1.1 2004/07/30 19:52:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus-bin/infobus-bin-1.2.ebuild,v 1.2 2004/10/16 17:16:52 axxo Exp $
 
 inherit java-pkg
 
@@ -37,7 +37,7 @@ src_unpack() {
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/
+	use doc && java-pkg_dohtml -r doc/
 	dohtml *.html
 	java-pkg_dojar infobus.jar
 }
diff --git a/dev-java/j2ssh/ChangeLog b/dev-java/j2ssh/ChangeLog
index 00dc5f406a18..e8cdf433c48c 100644
--- a/dev-java/j2ssh/ChangeLog
+++ b/dev-java/j2ssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/j2ssh
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/ChangeLog,v 1.4 2004/09/19 16:00:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/ChangeLog,v 1.5 2004/10/16 17:17:11 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> j2ssh-0.2.7-r1.ebuild,
+  j2ssh-0.2.7.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *j2ssh-0.2.7-r1 (19 Sep 2004)
 
diff --git a/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild b/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild
index 3c95dbb5b124..1ce8ed84a7e2 100644
--- a/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild
+++ b/dev-java/j2ssh/j2ssh-0.2.7-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/j2ssh/j2ssh-0.2.7-r1.ebuild,v 1.1 2004/09/19 16:00:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild,v 1.2 2004/10/16 17:17:11 axxo Exp $
 
 inherit java-pkg
 
@@ -40,5 +40,5 @@ src_install() {
 	java-pkg_dojar dist/lib/*.jar
 	insinto /usr/share/${PN}
 	doins j2ssh.properties
-	use doc && dohtml -r docs/ && cp -R ${S}/examples ${D}/usr/share/${PN}
+	use doc && java-pkg_dohtml -r docs/ && cp -R ${S}/examples ${D}/usr/share/${PN}
 }
diff --git a/dev-java/j2ssh/j2ssh-0.2.7.ebuild b/dev-java/j2ssh/j2ssh-0.2.7.ebuild
index da429e2f3511..26bba1b18853 100644
--- a/dev-java/j2ssh/j2ssh-0.2.7.ebuild
+++ b/dev-java/j2ssh/j2ssh-0.2.7.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/j2ssh/j2ssh-0.2.7.ebuild,v 1.3 2004/06/27 17:38:32 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/j2ssh-0.2.7.ebuild,v 1.4 2004/10/16 17:17:11 axxo Exp $
 
 inherit java-pkg
 
@@ -29,5 +29,5 @@ src_install() {
 	java-pkg_dojar dist/lib/*.jar
 	insinto /usr/share/${PN}
 	doins j2ssh.properties
-	use doc && dohtml -r docs/ && cp -R ${S}/examples ${D}/usr/share/${PN}
+	use doc && java-pkg_dohtml -r docs/ && cp -R ${S}/examples ${D}/usr/share/${PN}
 }
diff --git a/dev-java/jacl/ChangeLog b/dev-java/jacl/ChangeLog
index 3a6c06db22eb..dfb956354509 100644
--- a/dev-java/jacl/ChangeLog
+++ b/dev-java/jacl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jacl
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/ChangeLog,v 1.4 2004/08/24 04:20:57 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/ChangeLog,v 1.5 2004/10/16 17:17:30 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jacl-1.3.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> jacl-1.3.1.ebuild:
   Marking x86
diff --git a/dev-java/jacl/jacl-1.3.1.ebuild b/dev-java/jacl/jacl-1.3.1.ebuild
index 7080d474b9b5..f7159a3f6772 100644
--- a/dev-java/jacl/jacl-1.3.1.ebuild
+++ b/dev-java/jacl/jacl-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/jacl/jacl-1.3.1.ebuild,v 1.4 2004/08/24 04:20:57 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/jacl-1.3.1.ebuild,v 1.5 2004/10/16 17:17:30 axxo Exp $
 
 inherit java-pkg
 
@@ -30,5 +30,5 @@ src_install() {
 	dobin jaclsh
 	dodoc README ChangeLog known_issues.txt new_features.txt
 
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/jade-lib/ChangeLog b/dev-java/jade-lib/ChangeLog
index a380b81965ef..74152235ee91 100644
--- a/dev-java/jade-lib/ChangeLog
+++ b/dev-java/jade-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jade-lib
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jade-lib/ChangeLog,v 1.5 2004/08/23 21:42:40 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jade-lib/ChangeLog,v 1.6 2004/10/16 17:18:08 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jade-lib-7.0.6.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> -jade-lib-6.0.0.ebuild:
   Clean up
diff --git a/dev-java/jade-lib/jade-lib-7.0.6.ebuild b/dev-java/jade-lib/jade-lib-7.0.6.ebuild
index 107a243c3e62..e089702d616a 100644
--- a/dev-java/jade-lib/jade-lib-7.0.6.ebuild
+++ b/dev-java/jade-lib/jade-lib-7.0.6.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/jade-lib/jade-lib-7.0.6.ebuild,v 1.1 2004/08/23 21:41:45 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jade-lib/jade-lib-7.0.6.ebuild,v 1.2 2004/10/16 17:18:08 axxo Exp $
 
 inherit java-pkg
 
@@ -28,5 +28,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar jade.jar
-	use doc && dohtml -r api
+	use doc && java-pkg_dohtml -r api
 }
diff --git a/dev-java/jade/ChangeLog b/dev-java/jade/ChangeLog
index 1ad18dd9ef33..1f21ceaaac30 100644
--- a/dev-java/jade/ChangeLog
+++ b/dev-java/jade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jade
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jade/ChangeLog,v 1.9 2004/10/16 08:46:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jade/ChangeLog,v 1.10 2004/10/16 17:17:50 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jade-3.1.ebuild,
+  jade-3.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> jade-3.1.ebuild,
   jade-3.2.ebuild:
diff --git a/dev-java/jade/jade-3.1.ebuild b/dev-java/jade/jade-3.1.ebuild
index 4cfea62246e3..59d028c91917 100644
--- a/dev-java/jade/jade-3.1.ebuild
+++ b/dev-java/jade/jade-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/jade/jade-3.1.ebuild,v 1.6 2004/10/16 08:46:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jade/jade-3.1.ebuild,v 1.7 2004/10/16 17:17:50 axxo Exp $
 
 inherit java-pkg
 
@@ -31,5 +31,5 @@ src_compile(){
 src_install() {
 	java-pkg_dojar lib/*.jar
 	dodoc README ChangeLog
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/jade/jade-3.2.ebuild b/dev-java/jade/jade-3.2.ebuild
index c02b0d74a557..5a4501bc9b8c 100644
--- a/dev-java/jade/jade-3.2.ebuild
+++ b/dev-java/jade/jade-3.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/jade/jade-3.2.ebuild,v 1.3 2004/10/16 08:46:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jade/jade-3.2.ebuild,v 1.4 2004/10/16 17:17:50 axxo Exp $
 
 inherit java-pkg
 
@@ -27,5 +27,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/*.jar
 	dodoc README ChangeLog
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/jal-bin/ChangeLog b/dev-java/jal-bin/ChangeLog
index fb07a71c1553..9a0a62e0a356 100644
--- a/dev-java/jal-bin/ChangeLog
+++ b/dev-java/jal-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jal-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jal-bin/ChangeLog,v 1.3 2004/09/05 07:08:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jal-bin/ChangeLog,v 1.4 2004/10/16 17:18:28 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jal-bin-20031117-r1.ebuild,
+  jal-bin-20031117.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/jal-bin/jal-bin-20031117-r1.ebuild b/dev-java/jal-bin/jal-bin-20031117-r1.ebuild
index 5e332da204e2..9ec8db934ed0 100644
--- a/dev-java/jal-bin/jal-bin-20031117-r1.ebuild
+++ b/dev-java/jal-bin/jal-bin-20031117-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/jal-bin/jal-bin-20031117-r1.ebuild,v 1.1 2004/08/21 11:33:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jal-bin/jal-bin-20031117-r1.ebuild,v 1.2 2004/10/16 17:18:28 axxo Exp $
 
 inherit java-pkg
 
@@ -22,6 +22,6 @@ src_compile () { :; }
 src_install() {
 	mv ${MY_P}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/jal-bin/jal-bin-20031117.ebuild b/dev-java/jal-bin/jal-bin-20031117.ebuild
index 3641d45279b3..169d9ffb4c47 100644
--- a/dev-java/jal-bin/jal-bin-20031117.ebuild
+++ b/dev-java/jal-bin/jal-bin-20031117.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/jal-bin/jal-bin-20031117.ebuild,v 1.1 2004/07/30 20:12:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jal-bin/jal-bin-20031117.ebuild,v 1.2 2004/10/16 17:18:28 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ src_compile () { :; }
 src_install() {
 	mv ${P/-bin}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/jasmin-sable/ChangeLog b/dev-java/jasmin-sable/ChangeLog
index 4dd44c863f28..b7e1498296f0 100644
--- a/dev-java/jasmin-sable/ChangeLog
+++ b/dev-java/jasmin-sable/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jasmin-sable
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jasmin-sable/ChangeLog,v 1.6 2004/09/29 23:50:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jasmin-sable/ChangeLog,v 1.7 2004/10/16 17:18:47 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jasmin-sable-1.2.7.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> jasmin-sable-1.2.7.ebuild:
   Marking x86
diff --git a/dev-java/jasmin-sable/jasmin-sable-1.2.7.ebuild b/dev-java/jasmin-sable/jasmin-sable-1.2.7.ebuild
index 1a943a20da06..5b4dd7d3198a 100644
--- a/dev-java/jasmin-sable/jasmin-sable-1.2.7.ebuild
+++ b/dev-java/jasmin-sable/jasmin-sable-1.2.7.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/jasmin-sable/jasmin-sable-1.2.7.ebuild,v 1.4 2004/08/24 04:23:29 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jasmin-sable/jasmin-sable-1.2.7.ebuild,v 1.5 2004/10/16 17:18:47 axxo Exp $
 
 inherit java-pkg
 
@@ -37,7 +37,7 @@ src_install() {
 	java-pkg_dojar classes/{jas,jasmin,javacup,scm}.jar || die "Failed to install jars"
 
 	if use doc ; then
-		dohtml -r doc/*
+		java-pkg_dohtml -r doc/*
 	fi
 
 	dobin ${FILESDIR}/jasmin
diff --git a/dev-java/java-getopt/ChangeLog b/dev-java/java-getopt/ChangeLog
index 4cdf499b1d79..c90cbffa113f 100644
--- a/dev-java/java-getopt/ChangeLog
+++ b/dev-java/java-getopt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-getopt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/ChangeLog,v 1.6 2004/06/27 17:42:56 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/ChangeLog,v 1.7 2004/10/16 17:19:06 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> java-getopt-1.0.9.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> java-getopt-1.0.9.ebuild:
   Marking stable on ppc
diff --git a/dev-java/java-getopt/java-getopt-1.0.9.ebuild b/dev-java/java-getopt/java-getopt-1.0.9.ebuild
index b5351e070fa1..fb4dfc19d509 100644
--- a/dev-java/java-getopt/java-getopt-1.0.9.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.9.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/java-getopt/java-getopt-1.0.9.ebuild,v 1.7 2004/06/27 17:42:56 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/java-getopt-1.0.9.ebuild,v 1.8 2004/10/16 17:19:06 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Java command line option parser"
 HOMEPAGE="http://www.urbanophile.com/arenn/hacking/download.html"
@@ -14,17 +16,13 @@ IUSE=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
 src_compile() {
 	mv gnu/getopt/buildx.xml build.xml
-	ant all
+	ant all || die "failed to build"
 }
 
 src_install () {
-	dojar build/lib/gnu.getopt.jar
-	dohtml build/api/* -r
+	java-pkg_dojar build/lib/gnu.getopt.jar
+	java-pkg_dohtml -r build/api/*
 	dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README
 }
diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index a622526bcaf6..7daf25246259 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/javacc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.10 2004/09/05 11:27:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.11 2004/10/16 17:19:25 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> javacc-3.2-r2.ebuild,
+  javacc-3.2-r3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *javacc-3.2-r3 (05 Sep 2004)
 
diff --git a/dev-java/javacc/javacc-3.2-r2.ebuild b/dev-java/javacc/javacc-3.2-r2.ebuild
index eb64fee43f58..12cc69812bf6 100644
--- a/dev-java/javacc/javacc-3.2-r2.ebuild
+++ b/dev-java/javacc/javacc-3.2-r2.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/javacc/javacc-3.2-r2.ebuild,v 1.3 2004/08/31 03:50:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r2.ebuild,v 1.4 2004/10/16 17:19:25 axxo Exp $
 
 inherit java-pkg
 
@@ -28,7 +28,7 @@ src_compile() {
 
 src_install() {
 	if use doc ; then
-		dohtml -r www/* || die "Failed to install HTML files"
+		java-pkg_dohtml -r www/* || die "Failed to install HTML files"
 		dodir /usr/share/${PN}/examples
 		cp -R examples ${D}/usr/share/${PN} || die "Failed to copy examples"
 	fi
diff --git a/dev-java/javacc/javacc-3.2-r3.ebuild b/dev-java/javacc/javacc-3.2-r3.ebuild
index 07c16223f1ba..7293357908a8 100644
--- a/dev-java/javacc/javacc-3.2-r3.ebuild
+++ b/dev-java/javacc/javacc-3.2-r3.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/javacc/javacc-3.2-r3.ebuild,v 1.2 2004/09/05 13:29:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-3.2-r3.ebuild,v 1.3 2004/10/16 17:19:25 axxo Exp $
 
 inherit java-pkg
 
@@ -28,7 +28,7 @@ src_compile() {
 
 src_install() {
 	if use doc ; then
-		dohtml -r www/* || die "Failed to install HTML files"
+		java-pkg_dohtml -r www/* || die "Failed to install HTML files"
 		dodir /usr/share/${PN}/examples
 		cp -R examples ${D}/usr/share/${PN} || die "Failed to copy examples"
 	fi
diff --git a/dev-java/javahelp-bin/ChangeLog b/dev-java/javahelp-bin/ChangeLog
index 5ad2265b3a72..cd508a3d2c32 100644
--- a/dev-java/javahelp-bin/ChangeLog
+++ b/dev-java/javahelp-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javahelp-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp-bin/ChangeLog,v 1.2 2004/09/05 07:09:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp-bin/ChangeLog,v 1.3 2004/10/16 17:19:44 axxo Exp $
+
+*javahelp-bin-2.0.01 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> javahelp-bin-2.0.01.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/javahelp-bin/javahelp-bin-2.0.01.ebuild b/dev-java/javahelp-bin/javahelp-bin-2.0.01.ebuild
index bcf5f26054f4..9e4b73145075 100644
--- a/dev-java/javahelp-bin/javahelp-bin-2.0.01.ebuild
+++ b/dev-java/javahelp-bin/javahelp-bin-2.0.01.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/javahelp-bin/javahelp-bin-2.0.01.ebuild,v 1.1 2004/07/30 20:28:57 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp-bin/javahelp-bin-2.0.01.ebuild,v 1.2 2004/10/16 17:19:44 axxo Exp $
 
 inherit java-pkg
 
@@ -28,7 +28,7 @@ src_install(){
 	cp -R ${S}/javahelp/lib ${D}/usr/share/${PN}
 	cp -R ${S}/javahelp/bin ${D}/usr/share/${PN}/bin
 
-	use doc && cp -R ${S}/demos ${D}/usr/share/${PN} && dohtml -r doc
+	use doc && cp -R ${S}/demos ${D}/usr/share/${PN} && java-pkg_dohtml -r doc
 	dodoc README
 }
 
diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 053fd53cad84..b2eccae4f33a 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.1 2004/09/17 13:59:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.2 2004/10/16 17:20:02 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jaxen-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jaxen-1.0 (17 Sep 2004)
 
diff --git a/dev-java/jaxen/jaxen-1.0.ebuild b/dev-java/jaxen/jaxen-1.0.ebuild
index ec1fb099ca2b..86d7c3d72b88 100644
--- a/dev-java/jaxen/jaxen-1.0.ebuild
+++ b/dev-java/jaxen/jaxen-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/jaxen/jaxen-1.0.ebuild,v 1.1 2004/09/17 13:59:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0.ebuild,v 1.2 2004/10/16 17:20:02 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -50,5 +50,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/jaxen-full.jar
 
-	use doc && dohtml -r build/doc/*
+	use doc && java-pkg_dohtml -r build/doc/*
 }
diff --git a/dev-java/jclasslib/ChangeLog b/dev-java/jclasslib/ChangeLog
index 1acb9efc50a2..b3af268950eb 100644
--- a/dev-java/jclasslib/ChangeLog
+++ b/dev-java/jclasslib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jclasslib
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jclasslib/ChangeLog,v 1.1 2004/09/19 17:53:09 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jclasslib/ChangeLog,v 1.2 2004/10/16 17:20:21 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jclasslib-2.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jclasslib-2.0 (19 Sep 2004)
 
diff --git a/dev-java/jclasslib/jclasslib-2.0.ebuild b/dev-java/jclasslib/jclasslib-2.0.ebuild
index 5e98279ce231..f6b844601db8 100644
--- a/dev-java/jclasslib/jclasslib-2.0.ebuild
+++ b/dev-java/jclasslib/jclasslib-2.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/jclasslib/jclasslib-2.0.ebuild,v 1.1 2004/09/19 17:53:09 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jclasslib/jclasslib-2.0.ebuild,v 1.2 2004/10/16 17:20:21 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	dodoc license
 	java-pkg_dojar build/jclasslib.jar
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/jcommon/ChangeLog b/dev-java/jcommon/ChangeLog
index 55a774d4e419..24085c235e47 100644
--- a/dev-java/jcommon/ChangeLog
+++ b/dev-java/jcommon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jcommon
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/ChangeLog,v 1.2 2004/08/03 11:24:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/ChangeLog,v 1.3 2004/10/16 17:20:40 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jcommon-0.9.4.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> jcommon-0.9.4.ebuild:
   Added to ~ppc.
diff --git a/dev-java/jcommon/jcommon-0.9.4.ebuild b/dev-java/jcommon/jcommon-0.9.4.ebuild
index e4202b0b9e90..c605e323fbcf 100644
--- a/dev-java/jcommon/jcommon-0.9.4.ebuild
+++ b/dev-java/jcommon/jcommon-0.9.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/jcommon/jcommon-0.9.4.ebuild,v 1.2 2004/08/03 11:24:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-0.9.4.ebuild,v 1.3 2004/10/16 17:20:40 axxo Exp $
 
 inherit java-pkg
 
@@ -27,6 +27,6 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${P}.jar
 	dodoc README.txt licence-LGPL.txt
-	use doc && dohtml -r javadoc
+	use doc && java-pkg_dohtml -r javadoc
 }
 
diff --git a/dev-java/jdbc-informix/ChangeLog b/dev-java/jdbc-informix/ChangeLog
index cc0211809832..7da87f875ff9 100644
--- a/dev-java/jdbc-informix/ChangeLog
+++ b/dev-java/jdbc-informix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-informix
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/ChangeLog,v 1.3 2004/06/24 22:32:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/ChangeLog,v 1.4 2004/10/16 17:21:00 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jdbc-informix-221-r4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   10 Feb 2004; Adrian Almenar <strider@gentoo.org>
   jdbc-informix-221-r4.ebuild:
diff --git a/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild b/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild
index 445ea2202fe5..a9c7f178632c 100644
--- a/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-221-r4.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/jdbc-informix/jdbc-informix-221-r4.ebuild,v 1.3 2004/06/24 22:32:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild,v 1.4 2004/10/16 17:21:00 axxo Exp $
 
 inherit java-pkg
 
@@ -32,6 +32,6 @@ src_compile() {
 
 src_install() {
 	use doc && dodoc doc/release/jdbc4pg.pdf
-	use doc && dohtml -r doc/
+	use doc && java-pkg_dohtml -r doc/
 	java-pkg_dojar lib/ifx*.jar
 }
diff --git a/dev-java/jdbc-mssqlserver/ChangeLog b/dev-java/jdbc-mssqlserver/ChangeLog
index 6c65ac80e001..c67d9ebd2ad0 100644
--- a/dev-java/jdbc-mssqlserver/ChangeLog
+++ b/dev-java/jdbc-mssqlserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-mssqlserver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mssqlserver/ChangeLog,v 1.4 2004/06/24 22:33:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mssqlserver/ChangeLog,v 1.5 2004/10/16 17:21:19 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jdbc-mssqlserver-2.2.0029.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   10 Feb 2004; Adrian Almenar <strider@gentoo.org>
   jdbc-mssqlserver-2.2.0029.ebuild:
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild
index d2a706881906..d217a667175e 100644
--- a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.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/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild,v 1.5 2004/06/24 22:33:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild,v 1.6 2004/10/16 17:21:19 axxo Exp $
 
 inherit java-pkg
 
@@ -28,7 +28,7 @@ src_compile() {
 
 src_install() {
 	dodoc read.me EULA.txt MSfixes.txt
-	use doc && dohtml -r Help/*
+	use doc && java-pkg_dohtml -r Help/*
 	use doc && dodoc \
 			books/books.pdf
 			books/Msjdbcig/msjdbcig.pdf \
diff --git a/dev-java/jdbc2-oracle/ChangeLog b/dev-java/jdbc2-oracle/ChangeLog
index 7f5574c79242..fe82fc2ee8cb 100644
--- a/dev-java/jdbc2-oracle/ChangeLog
+++ b/dev-java/jdbc2-oracle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc2-oracle
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/ChangeLog,v 1.8 2004/09/02 08:41:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/ChangeLog,v 1.9 2004/10/16 17:21:39 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jdbc2-oracle-9.2.0.3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   02 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jdbc2-oracle-9.2.0.3.ebuild:
   fix typo in javadoc filename, closes #62590
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
index 2b582bc51ce5..3ff52f0772bf 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.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/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild,v 1.8 2004/09/02 08:41:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild,v 1.9 2004/10/16 17:21:39 axxo Exp $
 
 inherit java-pkg
 
@@ -72,7 +72,7 @@ src_compile() {
 
 src_install() {
 	if use doc ; then
-		dohtml -r ${S}/javadoc/
+		java-pkg_dohtml -r ${S}/javadoc/
 	fi
 	java-pkg_dojar ${S}/*.zip
 }
diff --git a/dev-java/jdbc3-oracle/ChangeLog b/dev-java/jdbc3-oracle/ChangeLog
index 8a5f1220dd27..9c183efbd8d6 100644
--- a/dev-java/jdbc3-oracle/ChangeLog
+++ b/dev-java/jdbc3-oracle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc3-oracle
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/ChangeLog,v 1.8 2004/09/04 23:13:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/ChangeLog,v 1.9 2004/10/16 17:21:57 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jdbc3-oracle-9.2.0.3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; David Holm <dholm@gentoo.org> jdbc3-oracle-9.2.0.3.ebuild:
   Added to ~ppc.
diff --git a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
index 92b58c551bcb..428da2be55b0 100644
--- a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
+++ b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.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/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild,v 1.10 2004/09/04 23:13:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild,v 1.11 2004/10/16 17:21:57 axxo Exp $
 
 inherit java-pkg
 
@@ -66,7 +66,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && dohtml -r ${S}/javadoc/
+	use doc && java-pkg_dohtml -r ${S}/javadoc/
 	java-pkg_dojar ${S}/*.zip
 	java-pkg_dojar ${S}/*.jar
 }
diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 21723fd59e6d..1deb1f064116 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.15 2004/09/19 08:45:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.16 2004/10/16 17:22:17 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jdom-1.0_beta10-r1.ebuild,
+  jdom-1.0_beta10.ebuild, jdom-1.0_beta9.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jdom-1.0_beta10-r1 (19 Sep 2004)
 
diff --git a/dev-java/jdom/jdom-1.0_beta10-r1.ebuild b/dev-java/jdom/jdom-1.0_beta10-r1.ebuild
index cfccf2834985..ea07e197f797 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r1.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-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/jdom/jdom-1.0_beta10-r1.ebuild,v 1.1 2004/09/19 08:45:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r1.ebuild,v 1.2 2004/10/16 17:22:17 axxo Exp $
 
 inherit java-pkg
 
@@ -48,7 +48,7 @@ src_install() {
 		build/*.jar
 
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-	use doc && dohtml -r build/apidocs/*
+	use doc && java-pkg_dohtml -r build/apidocs/*
 }
 
 pkg_postinst() {
diff --git a/dev-java/jdom/jdom-1.0_beta10.ebuild b/dev-java/jdom/jdom-1.0_beta10.ebuild
index dce9cce9b3cf..7671f4777783 100644
--- a/dev-java/jdom/jdom-1.0_beta10.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10.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/jdom/jdom-1.0_beta10.ebuild,v 1.2 2004/06/24 22:33:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10.ebuild,v 1.3 2004/10/16 17:22:17 axxo Exp $
 
 inherit java-pkg
 
@@ -35,7 +35,7 @@ src_install() {
 		build/*.jar
 
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-	use doc && dohtml -r build/apidocs/*
+	use doc && java-pkg_dohtml -r build/apidocs/*
 }
 
 pkg_postinst() {
diff --git a/dev-java/jdom/jdom-1.0_beta9.ebuild b/dev-java/jdom/jdom-1.0_beta9.ebuild
index 5f1f99df0aed..c736e19a285c 100644
--- a/dev-java/jdom/jdom-1.0_beta9.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9.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/jdom/jdom-1.0_beta9.ebuild,v 1.4 2004/06/24 22:33:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9.ebuild,v 1.5 2004/10/16 17:22:17 axxo Exp $
 
 inherit java-pkg
 
@@ -35,7 +35,7 @@ src_install() {
 		build/*.jar
 
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-	use doc && dohtml -r build/apidocs/*
+	use doc && java-pkg_dohtml -r build/apidocs/*
 }
 
 pkg_postinst() {
diff --git a/dev-java/jess-bin/ChangeLog b/dev-java/jess-bin/ChangeLog
index 701af8822024..ad309ce81c77 100644
--- a/dev-java/jess-bin/ChangeLog
+++ b/dev-java/jess-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jess-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jess-bin/ChangeLog,v 1.2 2004/09/05 07:10:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jess-bin/ChangeLog,v 1.3 2004/10/16 17:22:36 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jess-bin-6.1.6.ebuild,
+  jess-bin-6.1.7.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/jess-bin/jess-bin-6.1.6.ebuild b/dev-java/jess-bin/jess-bin-6.1.6.ebuild
index 5429faea0414..47efe78ca793 100644
--- a/dev-java/jess-bin/jess-bin-6.1.6.ebuild
+++ b/dev-java/jess-bin/jess-bin-6.1.6.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/jess-bin/jess-bin-6.1.6.ebuild,v 1.1 2004/07/30 20:43:27 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jess-bin/jess-bin-6.1.6.ebuild,v 1.2 2004/10/16 17:22:36 axxo Exp $
 
 inherit java-pkg
 
@@ -33,7 +33,7 @@ src_install() {
 
 	if use doc; then
 		einfo "Installing documentation..."
-		dohtml -r docs/*
+		java-pkg_dohtml -r docs/*
 		insinto /usr/share/doc/${P/-bin}/examples/
 		doins examples/*
 		local dirs="pumps simple xfer"
diff --git a/dev-java/jess-bin/jess-bin-6.1.7.ebuild b/dev-java/jess-bin/jess-bin-6.1.7.ebuild
index ab4c2d9bfd52..58ccb39424cf 100644
--- a/dev-java/jess-bin/jess-bin-6.1.7.ebuild
+++ b/dev-java/jess-bin/jess-bin-6.1.7.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/jess-bin/jess-bin-6.1.7.ebuild,v 1.1 2004/07/30 20:43:27 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jess-bin/jess-bin-6.1.7.ebuild,v 1.2 2004/10/16 17:22:36 axxo Exp $
 
 inherit java-pkg
 
@@ -33,7 +33,7 @@ src_install() {
 
 	if use doc; then
 		einfo "Installing documentation..."
-		dohtml -r docs/*
+		java-pkg_dohtml -r docs/*
 		insinto /usr/share/doc/${P/-bin}/examples/
 		doins examples/*
 		local dirs="pumps simple xfer"
diff --git a/dev-java/jessie/ChangeLog b/dev-java/jessie/ChangeLog
index 71b77c68d0f7..4fcb0bb6ff66 100644
--- a/dev-java/jessie/ChangeLog
+++ b/dev-java/jessie/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jessie
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jessie/ChangeLog,v 1.6 2004/09/29 23:54:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jessie/ChangeLog,v 1.7 2004/10/16 17:22:55 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jessie-1.0.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jessie-1.0.0 (30 Aug 2004)
 
diff --git a/dev-java/jessie/jessie-1.0.0.ebuild b/dev-java/jessie/jessie-1.0.0.ebuild
index b2aeb69e40b4..ca8e885f93a2 100644
--- a/dev-java/jessie/jessie-1.0.0.ebuild
+++ b/dev-java/jessie/jessie-1.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/jessie/jessie-1.0.0.ebuild,v 1.1 2004/08/31 03:45:48 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jessie/jessie-1.0.0.ebuild,v 1.2 2004/10/16 17:22:55 axxo Exp $
 
 inherit java-pkg
 
@@ -38,5 +38,5 @@ src_install() {
 	java-pkg_dojar lib/javax-net.jar \
 		lib/javax-security-cert.jar \
 		lib/org-metastatic-jessie.jar
-	use doc && dohtml -r apidoc/*
+	use doc && java-pkg_dohtml -r apidoc/*
 }
diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index 91c4a0b3b65c..14c01c3d1204 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jfreechart
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.3 2004/09/08 12:18:48 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.4 2004/10/16 17:23:15 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jfreechart-0.9.19.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   08 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jfreechart-0.9.19.ebuild:
   moved rm's to src_unpack
diff --git a/dev-java/jfreechart/jfreechart-0.9.19.ebuild b/dev-java/jfreechart/jfreechart-0.9.19.ebuild
index 904b4a8f4ad9..1ea0dc204a6f 100644
--- a/dev-java/jfreechart/jfreechart-0.9.19.ebuild
+++ b/dev-java/jfreechart/jfreechart-0.9.19.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/jfreechart/jfreechart-0.9.19.ebuild,v 1.3 2004/09/08 12:18:48 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-0.9.19.ebuild,v 1.4 2004/10/16 17:23:15 axxo Exp $
 
 inherit java-pkg
 
@@ -36,6 +36,6 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${P}.jar
 	dodoc README.txt CHANGELOG.txt
-	use doc && dohtml -r javadoc/
+	use doc && java-pkg_dohtml -r javadoc/
 }
 
diff --git a/dev-java/jgoodies-looks-bin/ChangeLog b/dev-java/jgoodies-looks-bin/ChangeLog
index e897c05deacf..497763704710 100644
--- a/dev-java/jgoodies-looks-bin/ChangeLog
+++ b/dev-java/jgoodies-looks-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jgoodies-looks-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks-bin/ChangeLog,v 1.4 2004/09/03 01:02:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks-bin/ChangeLog,v 1.5 2004/10/16 17:23:33 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jgoodies-looks-bin-1.2.1-r2.ebuild, jgoodies-looks-bin-1.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   03 Sep 2004; David Holm <dholm@gentoo.org>
   jgoodies-looks-bin-1.2.1-r2.ebuild:
diff --git a/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1-r2.ebuild b/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1-r2.ebuild
index a0dff2ad06c4..de0bce4648fc 100644
--- a/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1-r2.ebuild
+++ b/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1-r2.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/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1-r2.ebuild,v 1.2 2004/09/03 01:02:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1-r2.ebuild,v 1.3 2004/10/16 17:23:33 axxo Exp $
 
 inherit java-pkg
 
@@ -22,5 +22,5 @@ src_compile() { :; }
 src_install() {
 	java-pkg_dojar looks-${PV}.jar looks-win-${PV}.jar plastic-${PV}.jar
 	dodoc README.html RELEASE-NOTES.txt
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1.ebuild b/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1.ebuild
index 3fcf289d3ed1..1becf8b1cad7 100644
--- a/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1.ebuild
+++ b/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.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/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1.ebuild,v 1.3 2004/07/14 02:25:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks-bin/jgoodies-looks-bin-1.2.1.ebuild,v 1.4 2004/10/16 17:23:33 axxo Exp $
 
 inherit java-pkg
 
@@ -20,5 +20,5 @@ src_compile() { :; }
 src_install() {
 	java-pkg_dojar looks-1.2.1/{looks-${PV}.jar,looks-win-${PV}.jar,plastic-${PV}.jar}
 	dodoc looks-1.2.1/{README.html,RELEASE-NOTES.txt}
-	use doc && dohtml -r looks-1.2.1/docs/*
+	use doc && java-pkg_dohtml -r looks-1.2.1/docs/*
 }
diff --git a/dev-java/jgraph/ChangeLog b/dev-java/jgraph/ChangeLog
index b77fce20d31c..469ddc9a4fd0 100644
--- a/dev-java/jgraph/ChangeLog
+++ b/dev-java/jgraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jgraph
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgraph/ChangeLog,v 1.4 2004/06/24 22:34:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgraph/ChangeLog,v 1.5 2004/10/16 17:23:52 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jgraph-3.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 May 2004; <SeJo@gentoo.org> jgraph-3.2.ebuild:
   added ~ppc keyword
diff --git a/dev-java/jgraph/jgraph-3.2.ebuild b/dev-java/jgraph/jgraph-3.2.ebuild
index 1c9c341f9433..2ddba70861a2 100644
--- a/dev-java/jgraph/jgraph-3.2.ebuild
+++ b/dev-java/jgraph/jgraph-3.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/jgraph/jgraph-3.2.ebuild,v 1.3 2004/06/24 22:34:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgraph/jgraph-3.2.ebuild,v 1.4 2004/10/16 17:23:52 axxo Exp $
 
 inherit java-pkg
 
@@ -29,5 +29,5 @@ src_install () {
 	java-pkg_dojar lib/${PN}.jar
 
 	dodoc README LICENSE TODO WHATSNEW ChangeLog
-	use doc && dohtml -r doc/
+	use doc && java-pkg_dohtml -r doc/
 }
diff --git a/dev-java/jimi/ChangeLog b/dev-java/jimi/ChangeLog
index a1385e490cb0..531b2dc37135 100644
--- a/dev-java/jimi/ChangeLog
+++ b/dev-java/jimi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jimi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jimi/ChangeLog,v 1.2 2004/10/03 21:27:48 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jimi/ChangeLog,v 1.3 2004/10/16 17:24:11 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jimi-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   03 Oct 2004; Jason Wever <weeve@gentoo.org> jimi-1.0.ebuild:
   Added ~sparc keyword.
diff --git a/dev-java/jimi/jimi-1.0.ebuild b/dev-java/jimi/jimi-1.0.ebuild
index 97228166c08a..2bab410d8eb7 100644
--- a/dev-java/jimi/jimi-1.0.ebuild
+++ b/dev-java/jimi/jimi-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/jimi/jimi-1.0.ebuild,v 1.2 2004/10/03 21:27:48 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jimi/jimi-1.0.ebuild,v 1.3 2004/10/16 17:24:11 axxo Exp $
 
 inherit java-pkg
 
@@ -44,5 +44,5 @@ src_install() {
 	java-pkg_dojar src/${PN}.jar
 
 	dodoc Readme License
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/jldap/ChangeLog b/dev-java/jldap/ChangeLog
index f2abbeb3c44a..c49d314b4b55 100644
--- a/dev-java/jldap/ChangeLog
+++ b/dev-java/jldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jldap
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/ChangeLog,v 1.1 2004/07/30 01:49:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/ChangeLog,v 1.2 2004/10/16 17:24:30 axxo Exp $
+
+*jldap-20040730 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jldap-20040730.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
   initial import, bug 41276, ebuild submitted by Matthew Gregory Sr.
diff --git a/dev-java/jldap/jldap-20040730.ebuild b/dev-java/jldap/jldap-20040730.ebuild
index 2b5fb5404cf8..f437741ef344 100644
--- a/dev-java/jldap/jldap-20040730.ebuild
+++ b/dev-java/jldap/jldap-20040730.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/jldap/jldap-20040730.ebuild,v 1.2 2004/07/30 03:03:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/jldap-20040730.ebuild,v 1.3 2004/10/16 17:24:30 axxo Exp $
 
 inherit java-pkg
 
@@ -31,5 +31,5 @@ src_compile() {
 src_install() {
 	dodoc COPYRIGHT LICENSE README
 	java-pkg_dojar lib/*
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/jmdns/ChangeLog b/dev-java/jmdns/ChangeLog
index 8a3d5bdf5e71..09e4acccccc0 100644
--- a/dev-java/jmdns/ChangeLog
+++ b/dev-java/jmdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jmdns
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmdns/ChangeLog,v 1.3 2004/08/31 04:04:01 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmdns/ChangeLog,v 1.4 2004/10/16 17:24:49 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmdns-0.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   31 Aug 2004; Chris Aniszczyk <zx@gentoo.org> jmdns-0.2.ebuild:
   Marking x86
diff --git a/dev-java/jmdns/jmdns-0.2.ebuild b/dev-java/jmdns/jmdns-0.2.ebuild
index 42845fc6d2b5..e63c8399dfcc 100644
--- a/dev-java/jmdns/jmdns-0.2.ebuild
+++ b/dev-java/jmdns/jmdns-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/jmdns/jmdns-0.2.ebuild,v 1.3 2004/08/31 04:04:01 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmdns/jmdns-0.2.ebuild,v 1.4 2004/10/16 17:24:49 axxo Exp $
 
 inherit java-pkg
 
@@ -28,5 +28,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar jmdns*.jar
 	dodoc README.txt LICENSE.txt
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/jmx/ChangeLog b/dev-java/jmx/ChangeLog
index fe0944ebb824..708bc7c6731a 100644
--- a/dev-java/jmx/ChangeLog
+++ b/dev-java/jmx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jmx
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/ChangeLog,v 1.6 2004/10/12 19:29:50 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/ChangeLog,v 1.7 2004/10/16 17:25:08 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmx-1.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmx-1.2.1.ebuild:
   Fixed to compile with jikes, Thanks too Dan <dan@intuitivelyobvious.net> for
diff --git a/dev-java/jmx/jmx-1.2.1.ebuild b/dev-java/jmx/jmx-1.2.1.ebuild
index 7cfb9e4d2ec5..a7e3f0fc722c 100644
--- a/dev-java/jmx/jmx-1.2.1.ebuild
+++ b/dev-java/jmx/jmx-1.2.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/jmx/jmx-1.2.1.ebuild,v 1.5 2004/10/12 19:29:50 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/jmx-1.2.1.ebuild,v 1.6 2004/10/16 17:25:08 axxo Exp $
 
 inherit java-pkg
 
@@ -46,6 +46,6 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/*.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	use doc && dohtml -f examples/*
 }
diff --git a/dev-java/jnlp-bin/ChangeLog b/dev-java/jnlp-bin/ChangeLog
index bd048ad8f7b9..ab71b5124b82 100644
--- a/dev-java/jnlp-bin/ChangeLog
+++ b/dev-java/jnlp-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jnlp-bin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnlp-bin/ChangeLog,v 1.1 2004/09/21 19:33:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnlp-bin/ChangeLog,v 1.2 2004/10/16 17:25:26 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jnlp-bin-1.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jnlp-bin-1.2 (21 Sep 2004)
 
diff --git a/dev-java/jnlp-bin/jnlp-bin-1.2.ebuild b/dev-java/jnlp-bin/jnlp-bin-1.2.ebuild
index 653aa4427a06..113fcbc3a01b 100644
--- a/dev-java/jnlp-bin/jnlp-bin-1.2.ebuild
+++ b/dev-java/jnlp-bin/jnlp-bin-1.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/jnlp-bin/jnlp-bin-1.2.ebuild,v 1.2 2004/09/21 19:39:03 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnlp-bin/jnlp-bin-1.2.ebuild,v 1.3 2004/10/16 17:25:26 axxo Exp $
 
 inherit java-pkg
 
@@ -29,5 +29,5 @@ src_compile() { :; }
 
 src_install() {
 	java-pkg_dojar *.jar
-	dohtml -r .
+	java-pkg_dohtml -r .
 }
diff --git a/dev-java/joda-time/ChangeLog b/dev-java/joda-time/ChangeLog
index 583e634da713..2d63803a5317 100644
--- a/dev-java/joda-time/ChangeLog
+++ b/dev-java/joda-time/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/joda-time
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.5 2004/06/24 22:35:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.6 2004/10/16 17:25:44 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> joda-time-0.95.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> joda-time-0.95.ebuild:
   Stable on x86. Fixes according to #45398
diff --git a/dev-java/joda-time/joda-time-0.95.ebuild b/dev-java/joda-time/joda-time-0.95.ebuild
index 3d0094ad5285..c800f176d53e 100644
--- a/dev-java/joda-time/joda-time-0.95.ebuild
+++ b/dev-java/joda-time/joda-time-0.95.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/joda-time/joda-time-0.95.ebuild,v 1.4 2004/06/24 22:35:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-0.95.ebuild,v 1.5 2004/10/16 17:25:44 axxo Exp $
 
 inherit java-pkg
 
@@ -25,5 +25,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar build/*.jar
-	use doc && dohtml -r build/docs/
+	use doc && java-pkg_dohtml -r build/docs/
 }
diff --git a/dev-java/joscar/ChangeLog b/dev-java/joscar/ChangeLog
index 4e9076363eb1..0b116731e0cd 100644
--- a/dev-java/joscar/ChangeLog
+++ b/dev-java/joscar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/joscar
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joscar/ChangeLog,v 1.3 2004/06/24 22:36:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joscar/ChangeLog,v 1.4 2004/10/16 17:26:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> joscar-0.9.3.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> joscar-0.9.3.ebuild:
   Marking stable on x86. Fixes according to #45398
diff --git a/dev-java/joscar/joscar-0.9.3.ebuild b/dev-java/joscar/joscar-0.9.3.ebuild
index 6eba4ccc6c9c..5575dd6d1f32 100644
--- a/dev-java/joscar/joscar-0.9.3.ebuild
+++ b/dev-java/joscar/joscar-0.9.3.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/joscar/joscar-0.9.3.ebuild,v 1.3 2004/06/24 22:36:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joscar/joscar-0.9.3.ebuild,v 1.4 2004/10/16 17:26:03 axxo Exp $
 
 inherit java-pkg
 
@@ -28,5 +28,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar *.jar
 	dodoc USING CHANGELOG UPDATING README RELNOTES
-	use doc && dohtml -r docs/api
+	use doc && java-pkg_dohtml -r docs/api
 }
diff --git a/dev-java/jsch/ChangeLog b/dev-java/jsch/ChangeLog
index 83ba9bbdf19c..e47bc190bd94 100644
--- a/dev-java/jsch/ChangeLog
+++ b/dev-java/jsch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jsch
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.17 2004/09/28 15:29:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.18 2004/10/16 17:26:23 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jsch-0.1.15.ebuild,
+  jsch-0.1.16.ebuild, jsch-0.1.17.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jsch-0.1.17 (28 Sep 2004)
 
diff --git a/dev-java/jsch/jsch-0.1.15.ebuild b/dev-java/jsch/jsch-0.1.15.ebuild
index 8a48084ad45b..0218308cf446 100644
--- a/dev-java/jsch/jsch-0.1.15.ebuild
+++ b/dev-java/jsch/jsch-0.1.15.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/jsch/jsch-0.1.15.ebuild,v 1.5 2004/09/28 15:29:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.15.ebuild,v 1.6 2004/10/16 17:26:23 axxo Exp $
 
 inherit java-pkg
 
@@ -28,6 +28,6 @@ src_compile() {
 src_install() {
 	mv dist/lib/jsch{*,}.jar
 	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 	dodoc LICENSE.txt README ChangeLog
 }
diff --git a/dev-java/jsch/jsch-0.1.16.ebuild b/dev-java/jsch/jsch-0.1.16.ebuild
index 5b6ecd93d88a..523877cfeef5 100644
--- a/dev-java/jsch/jsch-0.1.16.ebuild
+++ b/dev-java/jsch/jsch-0.1.16.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/jsch/jsch-0.1.16.ebuild,v 1.3 2004/09/28 15:29:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.16.ebuild,v 1.4 2004/10/16 17:26:23 axxo Exp $
 
 inherit java-pkg
 
@@ -28,6 +28,6 @@ src_compile() {
 src_install() {
 	mv dist/lib/jsch{*,}.jar
 	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 	dodoc LICENSE.txt README ChangeLog
 }
diff --git a/dev-java/jsch/jsch-0.1.17.ebuild b/dev-java/jsch/jsch-0.1.17.ebuild
index 870a3483d4c3..2fb44b016c70 100644
--- a/dev-java/jsch/jsch-0.1.17.ebuild
+++ b/dev-java/jsch/jsch-0.1.17.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/jsch/jsch-0.1.17.ebuild,v 1.1 2004/09/28 15:29:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.17.ebuild,v 1.2 2004/10/16 17:26:23 axxo Exp $
 
 inherit java-pkg
 
@@ -28,6 +28,6 @@ src_compile() {
 src_install() {
 	mv dist/lib/jsch{*,}.jar
 	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 	dodoc LICENSE.txt README ChangeLog
 }
diff --git a/dev-java/jswat/ChangeLog b/dev-java/jswat/ChangeLog
index 6cb6080c7a4e..be201c018589 100644
--- a/dev-java/jswat/ChangeLog
+++ b/dev-java/jswat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jswat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.16 2004/09/22 10:31:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/ChangeLog,v 1.17 2004/10/16 17:26:44 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jswat-1.7.1-r1.ebuild,
+  jswat-2.21-r1.ebuild, jswat-2.25-r1.ebuild, jswat-2.25.ebuild,
+  jswat-2.27.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jswat-2.27 (22 Sep 2004)
 
diff --git a/dev-java/jswat/jswat-1.7.1-r1.ebuild b/dev-java/jswat/jswat-1.7.1-r1.ebuild
index 5617c41a9195..f96fc81d17dd 100644
--- a/dev-java/jswat/jswat-1.7.1-r1.ebuild
+++ b/dev-java/jswat/jswat-1.7.1-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/jswat/jswat-1.7.1-r1.ebuild,v 1.1 2004/08/27 10:16:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-1.7.1-r1.ebuild,v 1.2 2004/10/16 17:26:44 axxo Exp $
 
 inherit java-pkg
 
@@ -29,5 +29,5 @@ src_install () {
 	# install documents
 	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt TODO.txt
 	dohtml README.html
-	use doc && dohtml -r docs
+	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jswat/jswat-2.21-r1.ebuild b/dev-java/jswat/jswat-2.21-r1.ebuild
index a27217f046d9..3061d6df2b88 100644
--- a/dev-java/jswat/jswat-2.21-r1.ebuild
+++ b/dev-java/jswat/jswat-2.21-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/jswat/jswat-2.21-r1.ebuild,v 1.1 2004/08/27 10:16:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.21-r1.ebuild,v 1.2 2004/10/16 17:26:44 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -46,5 +46,5 @@ src_install() {
 	# install documents
 	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
-	use doc && dohtml -r docs
+	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jswat/jswat-2.25-r1.ebuild b/dev-java/jswat/jswat-2.25-r1.ebuild
index e77f42f88820..9613b71b4609 100644
--- a/dev-java/jswat/jswat-2.25-r1.ebuild
+++ b/dev-java/jswat/jswat-2.25-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/jswat/jswat-2.25-r1.ebuild,v 1.2 2004/09/19 18:31:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.25-r1.ebuild,v 1.3 2004/10/16 17:26:44 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -58,5 +58,5 @@ src_install() {
 	# install documents
 	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
-	use doc && dohtml -r docs
+	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jswat/jswat-2.25.ebuild b/dev-java/jswat/jswat-2.25.ebuild
index 9142faa35804..42cb76a2a0a7 100644
--- a/dev-java/jswat/jswat-2.25.ebuild
+++ b/dev-java/jswat/jswat-2.25.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/jswat/jswat-2.25.ebuild,v 1.2 2004/08/27 10:16:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.25.ebuild,v 1.3 2004/10/16 17:26:44 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -46,5 +46,5 @@ src_install() {
 	# install documents
 	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
-	use doc && dohtml -r docs
+	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jswat/jswat-2.27.ebuild b/dev-java/jswat/jswat-2.27.ebuild
index 2a7943c43b3b..e9c64d944329 100644
--- a/dev-java/jswat/jswat-2.27.ebuild
+++ b/dev-java/jswat/jswat-2.27.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/jswat/jswat-2.27.ebuild,v 1.1 2004/09/22 10:31:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.27.ebuild,v 1.2 2004/10/16 17:26:44 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -58,5 +58,5 @@ src_install() {
 	# install documents
 	dodoc BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
-	use doc && dohtml -r docs
+	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/jtidy/ChangeLog b/dev-java/jtidy/ChangeLog
index a65452424cc7..a12291205a59 100644
--- a/dev-java/jtidy/ChangeLog
+++ b/dev-java/jtidy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jtidy
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtidy/ChangeLog,v 1.1 2004/09/12 19:33:15 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtidy/ChangeLog,v 1.2 2004/10/16 17:27:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jtidy-0_pre20010801.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jtidy-0_pre20010801 (12 Sep 2004)
 
diff --git a/dev-java/jtidy/jtidy-0_pre20010801.ebuild b/dev-java/jtidy/jtidy-0_pre20010801.ebuild
index 3c8d5b64da6b..a8009a92cd6d 100644
--- a/dev-java/jtidy/jtidy-0_pre20010801.ebuild
+++ b/dev-java/jtidy/jtidy-0_pre20010801.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/jtidy/jtidy-0_pre20010801.ebuild,v 1.1 2004/09/12 19:33:15 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtidy/jtidy-0_pre20010801.ebuild,v 1.2 2004/10/16 17:27:03 axxo Exp $
 
 inherit java-pkg
 
@@ -27,5 +27,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/Tidy.jar
 
-	use doc && dohtml -r doc
+	use doc && java-pkg_dohtml -r doc
 }
diff --git a/dev-java/jump/ChangeLog b/dev-java/jump/ChangeLog
index acdfcf2fee47..bdd08cff5ef4 100644
--- a/dev-java/jump/ChangeLog
+++ b/dev-java/jump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jump
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jump/ChangeLog,v 1.4 2004/10/06 21:36:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jump/ChangeLog,v 1.5 2004/10/16 17:27:22 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jump-0.4.1-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jump-0.4.1-r1 (06 Oct 2004)
 
diff --git a/dev-java/jump/jump-0.4.1-r1.ebuild b/dev-java/jump/jump-0.4.1-r1.ebuild
index d495b77c0c29..cd77c99670e3 100644
--- a/dev-java/jump/jump-0.4.1-r1.ebuild
+++ b/dev-java/jump/jump-0.4.1-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/jump/jump-0.4.1-r1.ebuild,v 1.1 2004/10/06 21:36:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jump/jump-0.4.1-r1.ebuild,v 1.2 2004/10/16 17:27:22 axxo Exp $
 
 inherit java-pkg
 
@@ -29,5 +29,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar build/${PN}.jar
-	use doc && dohtml -r ${S}/build/apidocs/*
+	use doc && java-pkg_dohtml -r ${S}/build/apidocs/*
 }
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 6cbd0af4b422..033cdcbfc8e1 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/junit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.14 2004/09/10 19:49:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.15 2004/10/16 17:27:41 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> junit-3.8.1-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *junit-3.8.1-r1 (10 Sep 2004)
 
diff --git a/dev-java/junit/junit-3.8.1-r1.ebuild b/dev-java/junit/junit-3.8.1-r1.ebuild
index 13d53ac5ee4a..d5d54c386f73 100644
--- a/dev-java/junit/junit-3.8.1-r1.ebuild
+++ b/dev-java/junit/junit-3.8.1-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/junit/junit-3.8.1-r1.ebuild,v 1.1 2004/09/10 19:49:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.2 2004/10/16 17:27:41 axxo Exp $
 
 inherit java-pkg
 
@@ -35,6 +35,5 @@ src_install() {
 	java-pkg_dojar junit.jar
 	dodir /usr/share/ant-core/lib
 	dosym /usr/share/junit/lib/junit.jar /usr/share/ant-core/lib/
-	dohtml -A package-list -r README.html cpl-v10.html doc javadoc
-	cp javadoc/package-list	${D}/usr/share/doc/${PF}/html/javadoc/
+	java-pkg_dohtml -r README.html cpl-v10.html doc javadoc
 }
diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index e488569ab907..279d6c22feaf 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.21 2004/10/16 08:39:31 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.22 2004/10/16 17:28:01 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> jython-2.1-r5.ebuild:
   Stable on amd64.
diff --git a/dev-java/jython/jython-2.1-r5.ebuild b/dev-java/jython/jython-2.1-r5.ebuild
index d18bd3ec8a8a..031dc17d6edd 100644
--- a/dev-java/jython/jython-2.1-r5.ebuild
+++ b/dev-java/jython/jython-2.1-r5.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/jython/jython-2.1-r5.ebuild,v 1.10 2004/10/16 08:39:31 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r5.ebuild,v 1.11 2004/10/16 17:28:01 axxo Exp $
 
 inherit java-pkg
 
@@ -55,7 +55,7 @@ src_install() {
 	java-pkg_dojar jython-${PV}.jar || die "install failed"
 
 	dodoc {README,LICENSE}.txt NEWS ACKNOWLEDGMENTS
-	dohtml -A .css .jpg .gif -r Doc
+	java-pkg_dohtml -A .css .jpg .gif -r Doc
 	newbin ${FILESDIR}/jython jython
 	newbin ${FILESDIR}/jythonc jythonc
 
diff --git a/dev-java/jzlib/ChangeLog b/dev-java/jzlib/ChangeLog
index 948f2b1f868d..4bf7eca78fcc 100644
--- a/dev-java/jzlib/ChangeLog
+++ b/dev-java/jzlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jzlib
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/ChangeLog,v 1.10 2004/06/24 22:37:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/ChangeLog,v 1.11 2004/10/16 17:28:21 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jzlib-1.0.5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   21 May 2004; Chris Aniszczyk <zx@gentoo.org> jzlib-1.0.5.ebuild:
   Marking stable on x86
diff --git a/dev-java/jzlib/jzlib-1.0.5.ebuild b/dev-java/jzlib/jzlib-1.0.5.ebuild
index 48db3408b3ec..5b9437395166 100644
--- a/dev-java/jzlib/jzlib-1.0.5.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.5.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/jzlib/jzlib-1.0.5.ebuild,v 1.3 2004/06/24 22:37:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/jzlib-1.0.5.ebuild,v 1.4 2004/10/16 17:28:21 axxo Exp $
 
 inherit java-pkg
 
@@ -37,6 +37,6 @@ src_compile() {
 src_install() {
 	mv dist/lib/jzlib{*,}.jar
 	java-pkg_dojar dist/lib/jzlib.jar || die "installation failed"
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 	dodoc LICENSE.txt README ChangeLog
 }
diff --git a/dev-java/kissme/ChangeLog b/dev-java/kissme/ChangeLog
index d6fe0a29e845..87f5f0f04d83 100644
--- a/dev-java/kissme/ChangeLog
+++ b/dev-java/kissme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/kissme
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kissme/ChangeLog,v 1.9 2004/07/31 21:50:35 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kissme/ChangeLog,v 1.10 2004/10/16 17:28:39 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> kissme-0.0.32.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *kissme-0.0.32-r1 31 Jul 2004
 
diff --git a/dev-java/kissme/kissme-0.0.32.ebuild b/dev-java/kissme/kissme-0.0.32.ebuild
index 75f41dae6c5e..d1e322dc8252 100644
--- a/dev-java/kissme/kissme-0.0.32.ebuild
+++ b/dev-java/kissme/kissme-0.0.32.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/kissme/kissme-0.0.32.ebuild,v 1.4 2004/07/02 04:22:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kissme/kissme-0.0.32.ebuild,v 1.5 2004/10/16 17:28:39 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Tiny, JITless JVM"
 SRC_URI="mirror://sourceforge/kissme/${P}.tar.gz"
@@ -27,7 +29,7 @@ src_install () {
 	dodoc AUTHORS COPYING NEWS
 	dodoc doc/*.txt
 	dodoc doc/{TAGS,TIMING}
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	exeinto /usr/bin
 	newexe ${FILESDIR}/kissme.sh kissme
 }
diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog
index d039fc4482aa..6fc15b749f6e 100644
--- a/dev-java/libreadline-java/ChangeLog
+++ b/dev-java/libreadline-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libreadline-java
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.14 2004/10/16 08:39:03 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.15 2004/10/16 17:28:58 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   libreadline-java-0.8.0-r1.ebuild:
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild
index 8213733cba28..87fcd2a24cae 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.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/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.5 2004/10/16 08:39:03 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.6 2004/10/16 17:28:58 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -33,6 +33,6 @@ src_test() { :; }
 src_install() {
 	dolib.so *.so
 	dojar *.jar
-	use doc && dohtml -r api/*
+	use doc && java-pkg_dohtml -r api/*
 	dodoc  ChangeLog NEWS README README.1st TODO
 }
diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index a8dd2d36462a..010b8db91fcc 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.20 2004/10/08 14:00:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.21 2004/10/16 17:29:18 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> log4j-1.2.8-r1.ebuild,
+  log4j-1.2.8-r2.ebuild, log4j-1.2.8.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> log4j-1.2.8-r2.ebuild:
   Fixed to actualy install docs with USE=doc
diff --git a/dev-java/log4j/log4j-1.2.8-r1.ebuild b/dev-java/log4j/log4j-1.2.8-r1.ebuild
index 6c4c319e827a..883a92d21765 100644
--- a/dev-java/log4j/log4j-1.2.8-r1.ebuild
+++ b/dev-java/log4j/log4j-1.2.8-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/log4j/log4j-1.2.8-r1.ebuild,v 1.1 2004/09/17 09:29:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.8-r1.ebuild,v 1.2 2004/10/16 17:29:18 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ src_install() {
 	cd dist/lib
 	mv log4j-${PV}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/log4j/log4j-1.2.8-r2.ebuild b/dev-java/log4j/log4j-1.2.8-r2.ebuild
index b6dd7d42a4f3..0fd831d60955 100644
--- a/dev-java/log4j/log4j-1.2.8-r2.ebuild
+++ b/dev-java/log4j/log4j-1.2.8-r2.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/log4j/log4j-1.2.8-r2.ebuild,v 1.3 2004/10/08 14:00:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.8-r2.ebuild,v 1.4 2004/10/16 17:29:18 axxo Exp $
 
 inherit java-pkg
 
@@ -42,6 +42,6 @@ src_install() {
 	java-pkg_dojar ${PN}.jar
 
 	cd ${S}
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/log4j/log4j-1.2.8.ebuild b/dev-java/log4j/log4j-1.2.8.ebuild
index 26c47bebc7b8..066a0f07884d 100644
--- a/dev-java/log4j/log4j-1.2.8.ebuild
+++ b/dev-java/log4j/log4j-1.2.8.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/log4j/log4j-1.2.8.ebuild,v 1.11 2004/09/17 09:29:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.8.ebuild,v 1.12 2004/10/16 17:29:18 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ src_install() {
 	cd dist/lib
 	mv log4j-${PV}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 8e7debe7fbf1..3d6fa02b6f2d 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/lucene
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.9 2004/08/31 15:05:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.10 2004/10/16 17:29:38 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> lucene-1.3-r1.ebuild,
+  lucene-1.3.ebuild, lucene-1.4.1.ebuild, lucene-1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *lucene-1.4 (31 Aug 2004)
 
diff --git a/dev-java/lucene/lucene-1.3-r1.ebuild b/dev-java/lucene/lucene-1.3-r1.ebuild
index b8726a3e22ea..a5205819850e 100644
--- a/dev-java/lucene/lucene-1.3-r1.ebuild
+++ b/dev-java/lucene/lucene-1.3-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/lucene/lucene-1.3-r1.ebuild,v 1.3 2004/06/24 22:38:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.3-r1.ebuild,v 1.4 2004/10/16 17:29:38 axxo Exp $
 
 inherit java-pkg
 
@@ -30,5 +30,5 @@ src_install() {
 	cd build
 	mv lucene-1.4-rc1-dev.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/lucene/lucene-1.3.ebuild b/dev-java/lucene/lucene-1.3.ebuild
index 9188e2650c1b..33a7c11d132c 100644
--- a/dev-java/lucene/lucene-1.3.ebuild
+++ b/dev-java/lucene/lucene-1.3.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/lucene/lucene-1.3.ebuild,v 1.4 2004/06/24 22:38:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.3.ebuild,v 1.5 2004/10/16 17:29:38 axxo Exp $
 
 inherit java-pkg
 
@@ -30,5 +30,5 @@ src_install() {
 	cd build
 	mv lucene-1.4-rc1-dev.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/lucene/lucene-1.4.1.ebuild b/dev-java/lucene/lucene-1.4.1.ebuild
index 205be4d9d1c0..42e4e19be069 100644
--- a/dev-java/lucene/lucene-1.4.1.ebuild
+++ b/dev-java/lucene/lucene-1.4.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/lucene/lucene-1.4.1.ebuild,v 1.1 2004/08/31 15:05:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.1.ebuild,v 1.2 2004/10/16 17:29:38 axxo Exp $
 
 inherit java-pkg
 
@@ -28,5 +28,5 @@ src_install() {
 	cd build
 	mv lucene-1.5-rc1-dev.jar ${PN}.jar || die "mv failed"
 	java-pkg_dojar ${PN}.jar || die "dojar failed"
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/lucene/lucene-1.4.ebuild b/dev-java/lucene/lucene-1.4.ebuild
index d67395ea7bac..1c6f1a664735 100644
--- a/dev-java/lucene/lucene-1.4.ebuild
+++ b/dev-java/lucene/lucene-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/lucene/lucene-1.4.ebuild,v 1.1 2004/08/31 15:05:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.ebuild,v 1.2 2004/10/16 17:29:38 axxo Exp $
 
 inherit java-pkg
 
@@ -30,5 +30,5 @@ src_install() {
 	cd build
 	mv lucene-1.5-rc1-dev.jar ${PN}.jar || die "mv failed"
 	java-pkg_dojar ${PN}.jar || die "dojar failed"
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/mckoi/ChangeLog b/dev-java/mckoi/ChangeLog
index 02d97e940b05..587d28b3431a 100644
--- a/dev-java/mckoi/ChangeLog
+++ b/dev-java/mckoi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/mckoi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.2 2004/06/24 22:39:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.3 2004/10/16 17:29:57 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> mckoi-1.0.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *mckoi-1.0.2 (12 Jan 2004)
 
diff --git a/dev-java/mckoi/mckoi-1.0.2.ebuild b/dev-java/mckoi/mckoi-1.0.2.ebuild
index 8fe9f6f8a6a0..a1852ba1233c 100644
--- a/dev-java/mckoi/mckoi-1.0.2.ebuild
+++ b/dev-java/mckoi/mckoi-1.0.2.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/mckoi/mckoi-1.0.2.ebuild,v 1.2 2004/06/24 22:39:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.2.ebuild,v 1.3 2004/10/16 17:29:57 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Mckoi Java SQL Database System"
 HOMEPAGE="http://mckoi.com/database/"
@@ -50,6 +52,6 @@ src_compile() {
 
 src_install() {
 	dodoc LICENSE.txt README.txt db.conf
-	dojar lib/mckoidb-${PV}.jar
-	use doc && dohtml -r docs
+	java-pkg_dojar lib/mckoidb-${PV}.jar
+	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/mg4j-bin/ChangeLog b/dev-java/mg4j-bin/ChangeLog
index fb7c6fecbbfe..98b8a7f9a12c 100644
--- a/dev-java/mg4j-bin/ChangeLog
+++ b/dev-java/mg4j-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mg4j-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mg4j-bin/ChangeLog,v 1.4 2004/09/05 07:14:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mg4j-bin/ChangeLog,v 1.5 2004/10/16 17:30:17 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> mg4j-bin-0.8.2-r1.ebuild,
+  mg4j-bin-0.8.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/mg4j-bin/mg4j-bin-0.8.2-r1.ebuild b/dev-java/mg4j-bin/mg4j-bin-0.8.2-r1.ebuild
index 1825aed983b6..7defdd2faeb3 100644
--- a/dev-java/mg4j-bin/mg4j-bin-0.8.2-r1.ebuild
+++ b/dev-java/mg4j-bin/mg4j-bin-0.8.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/mg4j-bin/mg4j-bin-0.8.2-r1.ebuild,v 1.1 2004/08/21 11:49:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mg4j-bin/mg4j-bin-0.8.2-r1.ebuild,v 1.2 2004/10/16 17:30:17 axxo Exp $
 
 inherit java-pkg
 
@@ -26,6 +26,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/mg4j-bin/mg4j-bin-0.8.2.ebuild b/dev-java/mg4j-bin/mg4j-bin-0.8.2.ebuild
index 56bb64ed67df..b93488f98817 100644
--- a/dev-java/mg4j-bin/mg4j-bin-0.8.2.ebuild
+++ b/dev-java/mg4j-bin/mg4j-bin-0.8.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/mg4j-bin/mg4j-bin-0.8.2.ebuild,v 1.2 2004/08/03 11:42:53 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mg4j-bin/mg4j-bin-0.8.2.ebuild,v 1.3 2004/10/16 17:30:17 axxo Exp $
 
 inherit java-pkg
 
@@ -24,6 +24,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/mockobjects/ChangeLog b/dev-java/mockobjects/ChangeLog
index 526d280882a7..3a3b2a63509e 100644
--- a/dev-java/mockobjects/ChangeLog
+++ b/dev-java/mockobjects/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/mockobjects
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.4 2004/09/29 23:54:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.5 2004/10/16 17:30:36 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> mockobjects-0.09.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   28 Apr 2004; David Holm <dholm@gentoo.org> mockobjects-0.09.ebuild:
   Added to ~ppc.
diff --git a/dev-java/mockobjects/mockobjects-0.09.ebuild b/dev-java/mockobjects/mockobjects-0.09.ebuild
index 25d40a622aa1..719a93cacd35 100644
--- a/dev-java/mockobjects/mockobjects-0.09.ebuild
+++ b/dev-java/mockobjects/mockobjects-0.09.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/mockobjects/mockobjects-0.09.ebuild,v 1.4 2004/07/14 02:45:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09.ebuild,v 1.5 2004/10/16 17:30:36 axxo Exp $
 
 inherit java-pkg
 
@@ -40,5 +40,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar out/*.jar
 	dodoc doc/README
-	dohtml -r out/doc/javadoc/*
+	java-pkg_dohtml -r out/doc/javadoc/*
 }
diff --git a/dev-java/nanoxml/ChangeLog b/dev-java/nanoxml/ChangeLog
index d0342604db47..dceab4a83788 100644
--- a/dev-java/nanoxml/ChangeLog
+++ b/dev-java/nanoxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/nanoxml
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/ChangeLog,v 1.1 2004/09/21 19:36:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/ChangeLog,v 1.2 2004/10/16 17:30:55 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> nanoxml-2.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *nanoxml-2.2.1 (21 Sep 2004)
 
diff --git a/dev-java/nanoxml/nanoxml-2.2.1.ebuild b/dev-java/nanoxml/nanoxml-2.2.1.ebuild
index 089f4adf4f54..9cc0281c1f3e 100644
--- a/dev-java/nanoxml/nanoxml-2.2.1.ebuild
+++ b/dev-java/nanoxml/nanoxml-2.2.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/nanoxml/nanoxml-2.2.1.ebuild,v 1.1 2004/09/21 19:36:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/nanoxml-2.2.1.ebuild,v 1.2 2004/10/16 17:30:55 axxo Exp $
 
 inherit java-pkg
 
@@ -34,5 +34,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar Output/*.jar
 
-	use doc && dohtml -r Documentation/*
+	use doc && java-pkg_dohtml -r Documentation/*
 }
diff --git a/dev-java/netcomponents-bin/ChangeLog b/dev-java/netcomponents-bin/ChangeLog
index 250de0d78da9..d4da73b914a9 100644
--- a/dev-java/netcomponents-bin/ChangeLog
+++ b/dev-java/netcomponents-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/netcomponents-bin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netcomponents-bin/ChangeLog,v 1.1 2004/09/17 09:28:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netcomponents-bin/ChangeLog,v 1.2 2004/10/16 17:31:14 axxo Exp $
+
+*netcomponents-bin-1.3.8 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  netcomponents-bin-1.3.8.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *netcomponenets-bin-1.3.8 (16 Sep 2004)
 
diff --git a/dev-java/netcomponents-bin/netcomponents-bin-1.3.8.ebuild b/dev-java/netcomponents-bin/netcomponents-bin-1.3.8.ebuild
index decbb54cba29..71a5fee54af5 100644
--- a/dev-java/netcomponents-bin/netcomponents-bin-1.3.8.ebuild
+++ b/dev-java/netcomponents-bin/netcomponents-bin-1.3.8.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/netcomponents-bin/netcomponents-bin-1.3.8.ebuild,v 1.1 2004/09/17 09:28:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netcomponents-bin/netcomponents-bin-1.3.8.ebuild,v 1.2 2004/10/16 17:31:14 axxo Exp $
 
 inherit java-pkg
 
@@ -19,5 +19,5 @@ src_compile() { :; }
 
 src_install() {
 	java-pkg_dojar NetComponents.jar
-	use doc && dohtml -r doc/
+	use doc && java-pkg_dohtml -r doc/
 }
diff --git a/dev-java/oro/ChangeLog b/dev-java/oro/ChangeLog
index fba90bb8c8bb..2d5666b2ae92 100644
--- a/dev-java/oro/ChangeLog
+++ b/dev-java/oro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/oro
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oro/ChangeLog,v 1.15 2004/09/10 19:49:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oro/ChangeLog,v 1.16 2004/10/16 17:31:33 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> oro-2.0.8.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> oro-2.0.8.ebuild:
   changed dependenciess to ant-core
diff --git a/dev-java/oro/oro-2.0.8.ebuild b/dev-java/oro/oro-2.0.8.ebuild
index 06b64a50bab5..c98c906a5d56 100644
--- a/dev-java/oro/oro-2.0.8.ebuild
+++ b/dev-java/oro/oro-2.0.8.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/oro/oro-2.0.8.ebuild,v 1.6 2004/09/10 19:49:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oro/oro-2.0.8.ebuild,v 1.7 2004/10/16 17:31:33 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="A set of text-processing Java classes that provide Perl5 compatible regular expressions, AWK-like regular expressions, glob expressions, and utility classes for performing substitutions, splits, filtering filenames, etc."
 HOMEPAGE="http://jakarta.apache.org/oro/index.html"
@@ -34,9 +36,9 @@ src_compile() {
 
 src_install() {
 	mv jakarta-oro*.jar oro.jar
-	dojar oro.jar || die "Failed Installing"
+	java-pkg_dojar oro.jar
 	dodoc CHANGES COMPILE CONTRIBUTORS ISSUES LICENSE README STYLE TODO
 	dohtml *.html
 
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/oscore-bin/ChangeLog b/dev-java/oscore-bin/ChangeLog
index f3a22244b8b9..565000963b80 100644
--- a/dev-java/oscore-bin/ChangeLog
+++ b/dev-java/oscore-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/oscore-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oscore-bin/ChangeLog,v 1.2 2004/06/24 22:40:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscore-bin/ChangeLog,v 1.3 2004/10/16 17:31:52 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> oscore-bin-2.2.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *oscore-bin-2.2.4 (14 May 2004)
 
diff --git a/dev-java/oscore-bin/oscore-bin-2.2.4.ebuild b/dev-java/oscore-bin/oscore-bin-2.2.4.ebuild
index a924fda038e6..16a41387ffa0 100644
--- a/dev-java/oscore-bin/oscore-bin-2.2.4.ebuild
+++ b/dev-java/oscore-bin/oscore-bin-2.2.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/oscore-bin/oscore-bin-2.2.4.ebuild,v 1.2 2004/06/24 22:40:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscore-bin/oscore-bin-2.2.4.ebuild,v 1.3 2004/10/16 17:31:52 axxo Exp $
 
 inherit java-pkg
 
@@ -19,6 +19,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/picocontainer/ChangeLog b/dev-java/picocontainer/ChangeLog
index d0351d84d543..ead2654fb048 100644
--- a/dev-java/picocontainer/ChangeLog
+++ b/dev-java/picocontainer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/picocontainer
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.7 2004/09/11 21:32:04 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.8 2004/10/16 17:32:11 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  picocontainer-1.0_beta3.ebuild, picocontainer-1.0_beta4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   11 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
   picocontainer-1.0_beta3.ebuild:
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
index 3db56de80bad..55031cfccaff 100644
--- a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.0_beta3.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/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.5 2004/09/11 21:32:04 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.6 2004/10/16 17:32:11 axxo Exp $
 
 inherit java-pkg
 
@@ -39,6 +39,6 @@ src_compile() {
 
 src_install() {
 	dodoc LICENSE.txt
-	use doc && ( dohtml -r dist/docs/api )
+	use doc && ( java-pkg_dohtml -r dist/docs/api )
 	dojar target/picocontainer-1.0.jar
 }
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
index cbe0c20011e1..1e206df8ced2 100644
--- a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.0_beta4.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/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.4 2004/06/24 22:40:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.5 2004/10/16 17:32:11 axxo Exp $
 
 inherit java-pkg
 
@@ -39,6 +39,6 @@ src_compile() {
 
 src_install() {
 	dodoc LICENSE.txt
-	use doc && ( dohtml -r dist/docs/api )
+	use doc && ( java-pkg_dohtml -r dist/docs/api )
 	dojar target/picocontainer-1.0.jar
 }
diff --git a/dev-java/puretls/ChangeLog b/dev-java/puretls/ChangeLog
index 838c04af7b4d..8d99a3ba0467 100644
--- a/dev-java/puretls/ChangeLog
+++ b/dev-java/puretls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/puretls
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.2 2004/06/24 22:40:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.3 2004/10/16 17:32:30 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> puretls-0.94_beta4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *puretls-0.94_beta4 (16 May 2004)
 
diff --git a/dev-java/puretls/puretls-0.94_beta4.ebuild b/dev-java/puretls/puretls-0.94_beta4.ebuild
index 554d9f3f2da9..1ce89e254605 100644
--- a/dev-java/puretls/puretls-0.94_beta4.ebuild
+++ b/dev-java/puretls/puretls-0.94_beta4.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/puretls/puretls-0.94_beta4.ebuild,v 1.2 2004/06/24 22:40:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/puretls-0.94_beta4.ebuild,v 1.3 2004/10/16 17:32:30 axxo Exp $
 
 inherit java-pkg
 
@@ -36,5 +36,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar ${S}/build/${PN}.jar
 	dodoc ChangeLog CREDITS INSTALL LICENSE README
-	use doc && dohtml -r ${S}/build/doc/*
+	use doc && java-pkg_dohtml -r ${S}/build/doc/*
 }
diff --git a/dev-java/qat/ChangeLog b/dev-java/qat/ChangeLog
index 13abd161e4c9..ea3bbcf686b3 100644
--- a/dev-java/qat/ChangeLog
+++ b/dev-java/qat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/qat
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/ChangeLog,v 1.6 2004/10/06 22:12:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/ChangeLog,v 1.7 2004/10/16 17:32:49 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> qat-2.7.1-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *qat-2.7.1-r1 (07 Oct 2004)
 
diff --git a/dev-java/qat/qat-2.7.1-r1.ebuild b/dev-java/qat/qat-2.7.1-r1.ebuild
index 32d3e858e8bb..bde1d607b357 100644
--- a/dev-java/qat/qat-2.7.1-r1.ebuild
+++ b/dev-java/qat/qat-2.7.1-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/qat/qat-2.7.1-r1.ebuild,v 1.1 2004/10/06 22:12:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/qat-2.7.1-r1.ebuild,v 1.2 2004/10/16 17:32:49 axxo Exp $
 
 inherit java-pkg
 
@@ -39,6 +39,6 @@ src_install() {
 
 	dobin ${PN}
 
-	use doc && dohtml -r doc/* && dohtml -r specification/* && cp -R examples ${D}/usr/share/doc/${P}/
+	use doc && java-pkg_dohtml -r doc/* && dohtml -r specification/* && cp -R examples ${D}/usr/share/doc/${P}/
 }
 
diff --git a/dev-java/quartz/ChangeLog b/dev-java/quartz/ChangeLog
index 64f30948dc72..f443687e762c 100644
--- a/dev-java/quartz/ChangeLog
+++ b/dev-java/quartz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/quartz
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/ChangeLog,v 1.9 2004/09/05 07:12:52 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/ChangeLog,v 1.10 2004/10/16 17:33:10 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> quartz-1.3.4.ebuild,
+  quartz-1.4.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; Lim Swee Tat <st_lim@gentoo.org> quartz-1.4.0.ebuild:
   Using >= instead of = for dependencies
diff --git a/dev-java/quartz/quartz-1.3.4.ebuild b/dev-java/quartz/quartz-1.3.4.ebuild
index ddc4f771eed7..0597243bd1d4 100644
--- a/dev-java/quartz/quartz-1.3.4.ebuild
+++ b/dev-java/quartz/quartz-1.3.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/quartz/quartz-1.3.4.ebuild,v 1.9 2004/09/21 14:04:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.3.4.ebuild,v 1.10 2004/10/16 17:33:10 axxo Exp $
 
 inherit java-pkg
 
@@ -54,5 +54,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/quartz.jar
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/quartz/quartz-1.4.0.ebuild b/dev-java/quartz/quartz-1.4.0.ebuild
index 609507fd1195..975b790c440a 100644
--- a/dev-java/quartz/quartz-1.4.0.ebuild
+++ b/dev-java/quartz/quartz-1.4.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/quartz/quartz-1.4.0.ebuild,v 1.4 2004/09/21 14:04:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.0.ebuild,v 1.5 2004/10/16 17:33:10 axxo Exp $
 
 inherit java-pkg
 
@@ -54,5 +54,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/quartz.jar
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/radeox/ChangeLog b/dev-java/radeox/ChangeLog
index a851e956a38e..4e1e77a32d5c 100644
--- a/dev-java/radeox/ChangeLog
+++ b/dev-java/radeox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/radeox
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.5 2004/09/29 23:55:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.6 2004/10/16 17:33:29 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> radeox-1.0_beta2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   04 May 2004; David Holm <dholm@gentoo.org> radeox-1.0_beta2.ebuild:
   Added to ~ppc.
diff --git a/dev-java/radeox/radeox-1.0_beta2.ebuild b/dev-java/radeox/radeox-1.0_beta2.ebuild
index 0e5f2610f64c..652676affb57 100644
--- a/dev-java/radeox/radeox-1.0_beta2.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2.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/radeox/radeox-1.0_beta2.ebuild,v 1.4 2004/06/24 22:41:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.5 2004/10/16 17:33:29 axxo Exp $
 
 inherit java-pkg
 
@@ -44,6 +44,6 @@ src_compile() {
 
 src_install() {
 	dodoc Changes.txt README Radeox.version license.txt
-	use doc && dohtml -r docs/api
+	use doc && java-pkg_dohtml -r docs/api
 	java-pkg_dojar lib/{radeox,radeox-api}.jar
 }
diff --git a/dev-java/regexp/ChangeLog b/dev-java/regexp/ChangeLog
index b55dad939f8b..fe1f85fe8f97 100644
--- a/dev-java/regexp/ChangeLog
+++ b/dev-java/regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/regexp
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.15 2004/09/28 21:07:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.16 2004/10/16 17:33:48 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> regexp-1.3-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   28 Sep 2004; Thomas Matthijs <axxo@gentoo.org> regexp-1.3-r1.ebuild,
   regexp-1.3.ebuild:
diff --git a/dev-java/regexp/regexp-1.3-r1.ebuild b/dev-java/regexp/regexp-1.3-r1.ebuild
index e6f043d14ba5..16e3b57cf921 100644
--- a/dev-java/regexp/regexp-1.3-r1.ebuild
+++ b/dev-java/regexp/regexp-1.3-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/regexp/regexp-1.3-r1.ebuild,v 1.3 2004/09/28 21:07:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/regexp-1.3-r1.ebuild,v 1.4 2004/10/16 17:33:48 axxo Exp $
 
 inherit java-pkg
 
@@ -33,5 +33,5 @@ src_install() {
 	cd ${S}/build
 	mv jakarta-${P}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/api/*
+	use doc && java-pkg_dohtml -r docs/api/*
 }
diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index b261d407f081..ac19280afa17 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.18 2004/10/16 08:37:47 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.19 2004/10/16 17:34:07 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> rhino-1.5_rc5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> rhino-1.5_rc5.ebuild:
   Stable on amd64.
diff --git a/dev-java/rhino/rhino-1.5_rc5.ebuild b/dev-java/rhino/rhino-1.5_rc5.ebuild
index bfb63cac55d5..d5b4f64b35e5 100644
--- a/dev-java/rhino/rhino-1.5_rc5.ebuild
+++ b/dev-java/rhino/rhino-1.5_rc5.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/rhino/rhino-1.5_rc5.ebuild,v 1.11 2004/10/16 08:37:47 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc5.ebuild,v 1.12 2004/10/16 17:34:07 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -38,5 +38,5 @@ src_compile() {
 src_install() {
 	dobin ${FILESDIR}/jsscript
 	java-pkg_dojar build/*/js.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/sablecc-anttask/ChangeLog b/dev-java/sablecc-anttask/ChangeLog
index e47c15587f25..80541976ba18 100644
--- a/dev-java/sablecc-anttask/ChangeLog
+++ b/dev-java/sablecc-anttask/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sablecc-anttask
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/ChangeLog,v 1.1 2004/09/19 17:09:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/ChangeLog,v 1.2 2004/10/16 17:34:26 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  sablecc-anttask-1.1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *sablecc-anttask-1.1.0 (19 Sep 2004)
 
diff --git a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild
index e7154a00ef92..5524d451897d 100644
--- a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild
+++ b/dev-java/sablecc-anttask/sablecc-anttask-1.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/sablecc-anttask/sablecc-anttask-1.1.0.ebuild,v 1.1 2004/09/19 17:09:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild,v 1.2 2004/10/16 17:34:26 axxo Exp $
 
 inherit java-pkg
 
@@ -25,6 +25,6 @@ src_install() {
 	java-pkg_dojar lib/${PN}.jar
 	dodir /usr/share/ant-core/lib/
 	dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant-core/lib/
-	dohtml -r doc
+	java-pkg_dohtml -r doc
 	dodoc AUTHORS ChangeLog COPYING-LESSER LICENSE README
 }
diff --git a/dev-java/sax/ChangeLog b/dev-java/sax/ChangeLog
index 9f86c6e7aab8..a46b042715f6 100644
--- a/dev-java/sax/ChangeLog
+++ b/dev-java/sax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sax
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/ChangeLog,v 1.1 2004/09/21 19:35:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/ChangeLog,v 1.2 2004/10/16 17:34:45 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> sax-2.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *sax-2.2.1 (21 Sep 2004)
 
diff --git a/dev-java/sax/sax-2.2.1.ebuild b/dev-java/sax/sax-2.2.1.ebuild
index 55038c3cdc12..e0777400628c 100644
--- a/dev-java/sax/sax-2.2.1.ebuild
+++ b/dev-java/sax/sax-2.2.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/sax/sax-2.2.1.ebuild,v 1.1 2004/09/21 19:35:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/sax-2.2.1.ebuild,v 1.2 2004/10/16 17:34:45 axxo Exp $
 
 inherit java-pkg
 
@@ -35,5 +35,5 @@ src_install() {
 	java-pkg_dojar ${PN}.jar
 	dodoc ChangeLog CHANGES README
 
-	use doc && dohtml -r docs/javadoc/*
+	use doc && java-pkg_dohtml -r docs/javadoc/*
 }
diff --git a/dev-java/saxon-bin/ChangeLog b/dev-java/saxon-bin/ChangeLog
index 40dab2832d31..558f9cd3cbb8 100644
--- a/dev-java/saxon-bin/ChangeLog
+++ b/dev-java/saxon-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/saxon-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/ChangeLog,v 1.2 2004/09/05 07:17:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/ChangeLog,v 1.3 2004/10/16 17:35:05 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> saxon-bin-6.5.3.ebuild,
+  saxon-bin-7.8.ebuild, saxon-bin-8.0b.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/saxon-bin/saxon-bin-6.5.3.ebuild b/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild
index 9220c2751893..148a883c7ef3 100644
--- a/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild
+++ b/dev-java/saxon-bin/saxon-bin-6.5.3.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/saxon-bin/saxon-bin-6.5.3.ebuild,v 1.1 2004/07/30 21:46:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild,v 1.2 2004/10/16 17:35:05 axxo Exp $
 
 inherit java-pkg
 
@@ -19,6 +19,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/saxon-bin/saxon-bin-7.8.ebuild b/dev-java/saxon-bin/saxon-bin-7.8.ebuild
index ad7dd9f39d00..18866d5353fd 100644
--- a/dev-java/saxon-bin/saxon-bin-7.8.ebuild
+++ b/dev-java/saxon-bin/saxon-bin-7.8.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/saxon-bin/saxon-bin-7.8.ebuild,v 1.1 2004/07/30 21:46:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-7.8.ebuild,v 1.2 2004/10/16 17:35:05 axxo Exp $
 
 inherit java-pkg
 
@@ -19,6 +19,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/saxon-bin/saxon-bin-8.0b.ebuild b/dev-java/saxon-bin/saxon-bin-8.0b.ebuild
index 2f0f0069f033..872c7f985546 100644
--- a/dev-java/saxon-bin/saxon-bin-8.0b.ebuild
+++ b/dev-java/saxon-bin/saxon-bin-8.0b.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/saxon-bin/saxon-bin-8.0b.ebuild,v 1.1 2004/07/30 21:46:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-8.0b.ebuild,v 1.2 2004/10/16 17:35:05 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog
index 35e9ead20a7f..e1c10574c31a 100644
--- a/dev-java/saxpath/ChangeLog
+++ b/dev-java/saxpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/saxpath
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.1 2004/09/17 13:59:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.2 2004/10/16 17:35:25 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> saxpath-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *saxpath-1.0 (17 Sep 2004)
 
diff --git a/dev-java/saxpath/saxpath-1.0.ebuild b/dev-java/saxpath/saxpath-1.0.ebuild
index 68a214b29c36..a73964bca60f 100644
--- a/dev-java/saxpath/saxpath-1.0.ebuild
+++ b/dev-java/saxpath/saxpath-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/saxpath/saxpath-1.0.ebuild,v 1.1 2004/09/17 13:59:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0.ebuild,v 1.2 2004/10/16 17:35:25 axxo Exp $
 
 inherit java-pkg
 
@@ -42,5 +42,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/saxpath.jar
 
-	use doc && dohtml -r build/doc/*
+	use doc && java-pkg_dohtml -r build/doc/*
 }
diff --git a/dev-java/scala-bin/ChangeLog b/dev-java/scala-bin/ChangeLog
index b0628b73390c..a29fffc7e42c 100644
--- a/dev-java/scala-bin/ChangeLog
+++ b/dev-java/scala-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/scala-bin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.3 2004/09/28 00:31:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.4 2004/10/16 17:35:44 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> scala-bin-1.2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Gentoo Technologies, Inc. -> Gentoo Foundation
diff --git a/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild b/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild
index 786825c680a2..552871cfe14e 100644
--- a/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild
+++ b/dev-java/scala-bin/scala-bin-1.2.0.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/scala-bin/scala-bin-1.2.0.1.ebuild,v 1.2 2004/08/02 17:36:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild,v 1.3 2004/10/16 17:35:44 axxo Exp $
 
 inherit java-pkg
 
@@ -43,7 +43,7 @@ src_install() {
 
 	java-pkg_dojar lib/*.jar
 
-	dohtml -r doc/api
+	java-pkg_dohtml -r doc/api
 	cp -r examples ${D}/usr/share/doc/${PF}
 	dodoc doc/*.pdf
 	dodoc LICENSE README VERSION
diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index 63843e28b542..e39371e25bac 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/servletapi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.15 2004/06/24 22:42:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.16 2004/10/16 17:36:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> servletapi-2.2-r1.ebuild,
+  servletapi-2.3-r1.ebuild, servletapi-2.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> servletapi-2.2-r1.ebuild,
   servletapi-2.3-r1.ebuild, servletapi-2.4.ebuild:
diff --git a/dev-java/servletapi/servletapi-2.2-r1.ebuild b/dev-java/servletapi/servletapi-2.2-r1.ebuild
index f8bb76fb69a3..47ce3446a14c 100644
--- a/dev-java/servletapi/servletapi-2.2-r1.ebuild
+++ b/dev-java/servletapi/servletapi-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/servletapi/servletapi-2.2-r1.ebuild,v 1.3 2004/06/24 22:42:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r1.ebuild,v 1.4 2004/10/16 17:36:03 axxo Exp $
 
 inherit java-pkg
 
@@ -33,7 +33,7 @@ src_install () {
 	java-pkg_dojar servletapi/lib/${PN}-${PV}.jar || die "Unable to install"
 
 	if use doc ; then
-		dohtml -r servletapi/docs/*
+		java-pkg_dohtml -r servletapi/docs/*
 	fi
 
 	dodoc dist/README.txt
diff --git a/dev-java/servletapi/servletapi-2.3-r1.ebuild b/dev-java/servletapi/servletapi-2.3-r1.ebuild
index c4c5d2555f20..6d59a193a003 100644
--- a/dev-java/servletapi/servletapi-2.3-r1.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-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/servletapi/servletapi-2.3-r1.ebuild,v 1.3 2004/06/24 22:42:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r1.ebuild,v 1.4 2004/10/16 17:36:03 axxo Exp $
 
 inherit java-pkg
 
@@ -31,7 +31,7 @@ src_install () {
 	java-pkg_dojar dist/lib/${PN}-${PV}.jar || die "Unable to install"
 
 	if use doc ; then
-		dohtml -r dist/docs/*
+		java-pkg_dohtml -r dist/docs/*
 	fi
 
 	dodoc dist/README.txt
diff --git a/dev-java/servletapi/servletapi-2.4.ebuild b/dev-java/servletapi/servletapi-2.4.ebuild
index b81d8396f1dd..c13b7d84b955 100644
--- a/dev-java/servletapi/servletapi-2.4.ebuild
+++ b/dev-java/servletapi/servletapi-2.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/servletapi/servletapi-2.4.ebuild,v 1.12 2004/09/21 14:06:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4.ebuild,v 1.13 2004/10/16 17:36:03 axxo Exp $
 
 inherit java-pkg
 
@@ -42,6 +42,6 @@ src_install () {
 
 	cd ${S}
 	java-pkg_dojar *.jar || die "Unable to install"
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/soap/ChangeLog b/dev-java/soap/ChangeLog
index bd41460105a7..46757f8f232a 100644
--- a/dev-java/soap/ChangeLog
+++ b/dev-java/soap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/soap
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.1 2004/09/12 19:32:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.2 2004/10/16 17:36:22 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> soap-2.3.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *soap-2.3.1 (12 Sep 2004)
 
diff --git a/dev-java/soap/soap-2.3.1.ebuild b/dev-java/soap/soap-2.3.1.ebuild
index ed553c16c4bc..9503b41d1271 100644
--- a/dev-java/soap/soap-2.3.1.ebuild
+++ b/dev-java/soap/soap-2.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/soap/soap-2.3.1.ebuild,v 1.1 2004/09/12 19:32:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/soap-2.3.1.ebuild,v 1.2 2004/10/16 17:36:22 axxo Exp $
 
 inherit java-pkg
 DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
@@ -30,5 +30,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/lib/soap.jar
 
-	use doc && dohtml -r build/javadocs/
+	use doc && java-pkg_dohtml -r build/javadocs/
 }
diff --git a/dev-java/struts-legacy/ChangeLog b/dev-java/struts-legacy/ChangeLog
index 7701b6552b20..8d01ebfa5629 100644
--- a/dev-java/struts-legacy/ChangeLog
+++ b/dev-java/struts-legacy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/struts-legacy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.6 2004/10/03 13:48:55 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.7 2004/10/16 17:37:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  struts-legacy-1.0-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   03 Oct 2004; Karl Trygve Kalleberg <karltk@gentoo.org> struts-legacy-1.0-r1.ebuild:
   jdbc2-stdext is present in 1.4, and is only needed for 1.3 vms. Removed old 
diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
index 6c155d79e67b..82bc4985b004 100644
--- a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
+++ b/dev-java/struts-legacy/struts-legacy-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/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.5 2004/10/03 13:53:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.6 2004/10/16 17:37:03 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar dist/*.jar
 	dodoc STATUS.txt
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 49072c2e0cb0..ac1fb506951e 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.10 2004/10/12 20:44:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.11 2004/10/16 17:36:44 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> struts-1.1-r1.ebuild,
+  struts-1.1-r2.ebuild, struts-1.1.ebuild, struts-1.2.2-r1.ebuild,
+  struts-1.2.2.ebuild, struts-1.2.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> struts-1.2.2-r1.ebuild,
   struts-1.2.2.ebuild, struts-1.2.4.ebuild:
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
index 7d66581d67cd..70ebc6b299b4 100644
--- a/dev-java/struts/struts-1.1-r1.ebuild
+++ b/dev-java/struts/struts-1.1-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/struts/struts-1.1-r1.ebuild,v 1.6 2004/09/12 17:11:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.7 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 	dodoc README STATUS
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.1-r2.ebuild b/dev-java/struts/struts-1.1-r2.ebuild
index a2b1aced5417..c8551ad0a2a1 100644
--- a/dev-java/struts/struts-1.1-r2.ebuild
+++ b/dev-java/struts/struts-1.1-r2.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/struts/struts-1.1-r2.ebuild,v 1.1 2004/10/08 17:05:43 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r2.ebuild,v 1.2 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -56,5 +56,5 @@ src_install() {
 	doins target/library/*.tld
 
 	dodoc README STATUS
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.1.ebuild b/dev-java/struts/struts-1.1.ebuild
index 16c8f95a7da3..f23c1b2ffb26 100644
--- a/dev-java/struts/struts-1.1.ebuild
+++ b/dev-java/struts/struts-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/struts/struts-1.1.ebuild,v 1.5 2004/07/26 10:47:57 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1.ebuild,v 1.6 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 	dodoc README STATUS
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.2.2-r1.ebuild b/dev-java/struts/struts-1.2.2-r1.ebuild
index b6176ed11f71..72b580298639 100644
--- a/dev-java/struts/struts-1.2.2-r1.ebuild
+++ b/dev-java/struts/struts-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/struts/struts-1.2.2-r1.ebuild,v 1.2 2004/10/12 20:44:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r1.ebuild,v 1.3 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -56,5 +56,5 @@ src_install() {
 	doins target/library/*.tld
 
 	dodoc README STATUS.txt
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.2.2.ebuild b/dev-java/struts/struts-1.2.2.ebuild
index 660a42416528..8fc8633e1368 100644
--- a/dev-java/struts/struts-1.2.2.ebuild
+++ b/dev-java/struts/struts-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/struts/struts-1.2.2.ebuild,v 1.3 2004/10/12 20:44:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2.ebuild,v 1.4 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 	dodoc README STATUS.txt
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.2.4.ebuild b/dev-java/struts/struts-1.2.4.ebuild
index c1e6717bc9ac..37add05eb6c7 100644
--- a/dev-java/struts/struts-1.2.4.ebuild
+++ b/dev-java/struts/struts-1.2.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/struts/struts-1.2.4.ebuild,v 1.3 2004/10/15 06:45:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4.ebuild,v 1.4 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -56,5 +56,5 @@ src_install() {
 	doins target/library/*.tld
 
 	dodoc README STATUS.txt
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index 603e87235b1f..b1cd4d1876d9 100644
--- a/dev-java/sun-j2ee/ChangeLog
+++ b/dev-java/sun-j2ee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-j2ee
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.15 2004/07/02 04:23:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.16 2004/10/16 17:37:24 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2ee-1.3.1-r2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sun-j2ee-1.3.1-r2.ebuild:
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
index 38992d5cffd8..7c32889f4e0b 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.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/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild,v 1.3 2004/07/02 04:23:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild,v 1.4 2004/10/16 17:37:24 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Sun's Java 2 Enterprise Edition Development Kit"
 SRC_URI="j2sdkee-1_3_1-linux.tar.gz"
@@ -29,16 +31,15 @@ src_install () {
 		cp -a $i ${D}/opt/${P}/
 	done
 
-	# Setup env vars
-	addwrite /etc/env.d/29${P}
-	j2eeenv=/etc/env.d/29${P}
+	dodir /etc/env.d/
+	local j2eeenv=${D}/etc/env.d/29${P}
 	echo "CLASSPATH=/opt/${P}/lib/j2ee.jar" > $j2eeenv
 	echo "PATH=/opt/${P}/bin" >> $j2eeenv
 	echo "J2EE_HOME=/opt/${P}" >> $j2eeenv
 	dodoc LICENSE README
 
 	if use doc ; then
-		dohtml -r doc/*
+		java-pkg_dohtml -r doc/*
 	fi
 }
 
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/*
 }
author	Thomas Matthijs <axxo@gentoo.org>	2004-10-16 17:42:34 +0000
committer	Thomas Matthijs <axxo@gentoo.org>	2004-10-16 17:42:34 +0000
commit	c79ebad8f9d5608e516a9916f7bf951481c3a9bf (patch)
tree	6e26809a1b9be56137c9d33572e2aa403a327817 /dev-java
parent	old (diff)
download	historical-c79ebad8f9d5608e516a9916f7bf951481c3a9bf.tar.gz historical-c79ebad8f9d5608e516a9916f7bf951481c3a9bf.tar.bz2 historical-c79ebad8f9d5608e516a9916f7bf951481c3a9bf.zip