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

35 files changed, 124 insertions, 54 deletions

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/
 }