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

39 files changed, 142 insertions, 65 deletions

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
 }