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

38 files changed, 138 insertions, 62 deletions

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