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

38 files changed, 137 insertions, 67 deletions

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index d4a50baa9adf..c7ace5fcb8be 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/jmeter
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.13 2004/10/12 19:35:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.14 2004/10/16 18:13:51 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+  jmeter-2.0.1-r1.ebuild, jmeter-2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
   jmeter-2.0.1.ebuild:
diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index 49b6efa6fac8..e25d71197cd7 100644
--- a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.9.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/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.4 2004/10/12 19:35:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.5 2004/10/16 18:13:51 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databases."
 HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
@@ -28,5 +30,5 @@ src_install () {
 	dodir /opt/${PN}
 	cp -ar bin/ lib/ ${D}/opt/${PN}/
 	dodoc README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild
index 0609159aff5d..541643e943c6 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.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/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild,v 1.2 2004/09/19 19:32:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild,v 1.3 2004/10/16 18:13:51 axxo Exp $
 
 inherit java-pkg
 
@@ -61,5 +61,5 @@ src_install () {
 	dodir /opt/${PN}
 	cp -ar bin/ lib/ printable_docs/ ${D}/opt/${PN}/
 	dodoc README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
index 9a16a1a35209..baa7fbaf8880 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.2 2004/10/12 19:35:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.3 2004/10/16 18:13:51 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases."
 HOMEPAGE="http://jakarta.apache.org/jmeter"
@@ -30,5 +32,5 @@ src_install () {
 	dodir /opt/${PN}
 	cp -ar bin/ lib/ printable_docs/ ${D}/opt/${PN}/
 	dodoc README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index d1e995df1297..27a0610810f6 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/freemind
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.11 2004/10/05 13:34:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.12 2004/10/16 18:14:18 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> freemind-0.7.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   freemind-0.7.1.ebuild:
diff --git a/app-misc/freemind/freemind-0.7.1.ebuild b/app-misc/freemind/freemind-0.7.1.ebuild
index 61c5d7db7136..91bd8ee14860 100644
--- a/app-misc/freemind/freemind-0.7.1.ebuild
+++ b/app-misc/freemind/freemind-0.7.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/app-misc/freemind/freemind-0.7.1.ebuild,v 1.10 2004/10/05 13:34:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.7.1.ebuild,v 1.11 2004/10/16 18:14:18 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Mind-mapping software written in Java"
 HOMEPAGE="http://freemind.sf.net"
@@ -34,7 +36,7 @@ src_install() {
 	echo "'${JAVA_HOME}'/bin/java -jar lib/${PN}.jar" >> ${PN}.sh
 
 	cp -R ${S}/doc ${D}/opt/${PN}
-	use doc && dohtml -r doc/
+	use doc && java-pkg_dohtml -r doc/
 
 	into /opt
 	newbin ${PN}.sh ${PN}
diff --git a/app-misc/jitac/ChangeLog b/app-misc/jitac/ChangeLog
index 76190c5e91cf..6f72011ad90d 100644
--- a/app-misc/jitac/ChangeLog
+++ b/app-misc/jitac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/jitac
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jitac/ChangeLog,v 1.9 2004/10/05 13:34:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jitac/ChangeLog,v 1.10 2004/10/16 18:14:38 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jitac-0.2.0-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> jitac-0.2.0.ebuild:
   Masked jitac-0.2.0.ebuild stable for ppc
diff --git a/app-misc/jitac/jitac-0.2.0-r1.ebuild b/app-misc/jitac/jitac-0.2.0-r1.ebuild
index b8dc4487c4ca..93d0af2f9d88 100644
--- a/app-misc/jitac/jitac-0.2.0-r1.ebuild
+++ b/app-misc/jitac/jitac-0.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/app-misc/jitac/jitac-0.2.0-r1.ebuild,v 1.2 2004/10/03 21:28:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jitac/jitac-0.2.0-r1.ebuild,v 1.3 2004/10/16 18:14:38 axxo Exp $
 
 inherit java-pkg
 
@@ -37,6 +37,6 @@ src_install() {
 	dobin ${PN}
 
 	dodoc org/roqe/jitac/README
-	use doc && dohtml -r org/roqe/jitac/docs/*
+	use doc && java-pkg_dohtml -r org/roqe/jitac/docs/*
 }
 
diff --git a/app-office/ganttproject/ChangeLog b/app-office/ganttproject/ChangeLog
index 8fd3348ac3d1..0ea721dafa2d 100644
--- a/app-office/ganttproject/ChangeLog
+++ b/app-office/ganttproject/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/ganttproject
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ganttproject/ChangeLog,v 1.5 2004/10/12 18:10:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ganttproject/ChangeLog,v 1.6 2004/10/16 18:15:00 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> ganttproject-1.10.1.ebuild,
+  ganttproject-1.9.11-r1.ebuild, ganttproject-1.9.11.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *ganttproject-1.10.1 (12 Oct 2004)
 
diff --git a/app-office/ganttproject/ganttproject-1.10.1.ebuild b/app-office/ganttproject/ganttproject-1.10.1.ebuild
index 3b09949b5d48..4b0ebe28c6ed 100644
--- a/app-office/ganttproject/ganttproject-1.10.1.ebuild
+++ b/app-office/ganttproject/ganttproject-1.10.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/app-office/ganttproject/ganttproject-1.10.1.ebuild,v 1.1 2004/10/12 18:10:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ganttproject/ganttproject-1.10.1.ebuild,v 1.2 2004/10/16 18:15:00 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -33,7 +33,7 @@ src_install () {
 	doexe ganttproject
 	dodoc AUTHORS  COPYING  README
 	if use doc; then
-		dohtml -r build/docs/api
+		java-pkg_dohtml -r build/docs/api
 	fi
 	if use gnome; then
 		mkdir -p ${D}/usr/share/gnome/apps/Office/
diff --git a/app-office/ganttproject/ganttproject-1.9.11-r1.ebuild b/app-office/ganttproject/ganttproject-1.9.11-r1.ebuild
index e3920dcc5105..2acf79799f86 100644
--- a/app-office/ganttproject/ganttproject-1.9.11-r1.ebuild
+++ b/app-office/ganttproject/ganttproject-1.9.11-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/app-office/ganttproject/ganttproject-1.9.11-r1.ebuild,v 1.1 2004/09/16 18:58:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ganttproject/ganttproject-1.9.11-r1.ebuild,v 1.2 2004/10/16 18:15:00 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -33,7 +33,7 @@ src_install () {
 	doexe ganttproject
 	dodoc AUTHORS  COPYING  README
 	if use doc; then
-		dohtml -r build/docs/api
+		java-pkg_dohtml -r build/docs/api
 	fi
 	if use gnome; then
 		mkdir -p ${D}/usr/share/gnome/apps/Office/
diff --git a/app-office/ganttproject/ganttproject-1.9.11.ebuild b/app-office/ganttproject/ganttproject-1.9.11.ebuild
index 42ddff59a52a..cfdf9ca0b91c 100644
--- a/app-office/ganttproject/ganttproject-1.9.11.ebuild
+++ b/app-office/ganttproject/ganttproject-1.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ganttproject/ganttproject-1.9.11.ebuild,v 1.3 2004/08/27 01:49:35 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ganttproject/ganttproject-1.9.11.ebuild,v 1.4 2004/10/16 18:15:00 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -34,7 +34,7 @@ src_install () {
 	doexe ganttproject
 	dodoc AUTHORS  COPYING  README
 	if use doc; then
-		dohtml -r build/docs/api
+		java-pkg_dohtml -r build/docs/api
 	fi
 	if use gnome; then
 		mkdir -p ${D}/usr/share/gnome/apps/Office/
diff --git a/app-text/itext/ChangeLog b/app-text/itext/ChangeLog
index d154963fc985..7c5b863e685c 100644
--- a/app-text/itext/ChangeLog
+++ b/app-text/itext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/itext
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/itext/ChangeLog,v 1.4 2004/08/24 03:14:55 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/itext/ChangeLog,v 1.5 2004/10/16 18:15:21 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> itext-1.02b.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> itext-1.02b.ebuild:
   Marking stable on x86
diff --git a/app-text/itext/itext-1.02b.ebuild b/app-text/itext/itext-1.02b.ebuild
index 9bfe3b8af8d2..a2da47eeb295 100644
--- a/app-text/itext/itext-1.02b.ebuild
+++ b/app-text/itext/itext-1.02b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/itext/itext-1.02b.ebuild,v 1.4 2004/08/24 03:14:55 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/itext/itext-1.02b.ebuild,v 1.5 2004/10/16 18:15:21 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/*
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-text/jasperreports/ChangeLog b/app-text/jasperreports/ChangeLog
index 311fdb3493e0..b8d2aad72d35 100644
--- a/app-text/jasperreports/ChangeLog
+++ b/app-text/jasperreports/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/jasperreports
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/ChangeLog,v 1.5 2004/09/01 08:12:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/ChangeLog,v 1.6 2004/10/16 18:15:46 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jasperreports-0.6.1-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jasperreports-0.6.1-r1 (01 Sep 2004)
 
diff --git a/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild b/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild
index c607601f0f8a..e3991f853af5 100644
--- a/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild
+++ b/app-text/jasperreports/jasperreports-0.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/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild,v 1.1 2004/09/01 08:12:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild,v 1.2 2004/10/16 18:15:46 axxo Exp $
 
 inherit java-pkg
 
@@ -32,5 +32,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/*.jar || die "Missing jars"
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-text/jing/ChangeLog b/app-text/jing/ChangeLog
index c3b70a7e7fea..ce80f9a9ae28 100644
--- a/app-text/jing/ChangeLog
+++ b/app-text/jing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/jing
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jing/ChangeLog,v 1.4 2004/08/24 03:20:13 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jing/ChangeLog,v 1.5 2004/10/16 18:16:09 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jing-20030619.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> jing-20030619.ebuild:
   Marking stable on x86
diff --git a/app-text/jing/jing-20030619.ebuild b/app-text/jing/jing-20030619.ebuild
index 745b20cd338e..c02e7d2433e3 100644
--- a/app-text/jing/jing-20030619.ebuild
+++ b/app-text/jing/jing-20030619.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/app-text/jing/jing-20030619.ebuild,v 1.5 2004/08/24 03:20:13 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jing/jing-20030619.ebuild,v 1.6 2004/10/16 18:16:09 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Jing: A RELAX NG validator in Java"
 HOMEPAGE="http://thaiopensource.com/relaxng/jing.html"
@@ -16,11 +18,11 @@ DEPEND=""
 
 
 src_install() {
-	dojar bin/jing.jar
+	java-pkg_dojar bin/jing.jar
 	cat >jing <<'EOF'
 #!/bin/sh
 exec `java-config --java` -classpath `java-config -p xerces,saxon` -jar `java-config -p jing` "$@"
 EOF
 	dobin jing
-	dohtml -r doc/* readme.html
+	java-pkg_dohtml -r doc/* readme.html
 }
diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index 49e52f8e19fb..fe3518aacadf 100644
--- a/dev-util/checkstyle/ChangeLog
+++ b/dev-util/checkstyle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/checkstyle
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.7 2004/10/14 20:08:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.8 2004/10/16 18:16:29 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> checkstyle-3.3.ebuild,
+  checkstyle-3.4-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> checkstyle-3.4-r2.ebuild:
   Added to ~ppc.
diff --git a/dev-util/checkstyle/checkstyle-3.3.ebuild b/dev-util/checkstyle/checkstyle-3.3.ebuild
index b60e74af8384..0663980a2b7b 100644
--- a/dev-util/checkstyle/checkstyle-3.3.ebuild
+++ b/dev-util/checkstyle/checkstyle-3.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-util/checkstyle/checkstyle-3.3.ebuild,v 1.6 2004/09/04 16:13:07 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.3.ebuild,v 1.7 2004/10/16 18:16:29 axxo Exp $
 
 inherit java-pkg
 
@@ -37,7 +37,7 @@ src_install() {
 	insinto /usr/share/checkstyle
 	jar cfm ${P}.jar config/manifest.mf -C target/checkstyle .
 	java-pkg_dojar ${P}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	dodoc README RIGHTS.antlr TODO
 	mv docs/checkstyle_checks.xml ${D}/usr/share/checkstyle/checkstyle_checks.xml
 	mv docs/sun_checks.xml ${D}/usr/share/checkstyle/sun_checks.xml
diff --git a/dev-util/checkstyle/checkstyle-3.4-r2.ebuild b/dev-util/checkstyle/checkstyle-3.4-r2.ebuild
index 6239f7df1719..11701be46a17 100644
--- a/dev-util/checkstyle/checkstyle-3.4-r2.ebuild
+++ b/dev-util/checkstyle/checkstyle-3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r2.ebuild,v 1.2 2004/10/14 20:08:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r2.ebuild,v 1.3 2004/10/16 18:16:29 axxo Exp $
 
 inherit java-pkg
 
@@ -54,7 +54,7 @@ src_install() {
 	insinto /usr/share/checkstyle
 	jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle .
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	dodoc README RIGHTS.antlr TODO
 	mv docs/checkstyle_checks.xml ${D}/usr/share/checkstyle/checkstyle_checks.xml
 	mv docs/sun_checks.xml ${D}/usr/share/checkstyle/sun_checks.xml
diff --git a/dev-util/jconfig/ChangeLog b/dev-util/jconfig/ChangeLog
index 473123208c95..bda0da3b457c 100644
--- a/dev-util/jconfig/ChangeLog
+++ b/dev-util/jconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/jconfig
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/ChangeLog,v 1.6 2004/09/01 07:43:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/ChangeLog,v 1.7 2004/10/16 18:16:50 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jconfig-2.5.ebuild,
+  jconfig-2.7.ebuild, jconfig-2.8.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *jconfig-2.8 (01 Sep 2004)
 
diff --git a/dev-util/jconfig/jconfig-2.5.ebuild b/dev-util/jconfig/jconfig-2.5.ebuild
index e971e0db8652..2a6ca84b1505 100644
--- a/dev-util/jconfig/jconfig-2.5.ebuild
+++ b/dev-util/jconfig/jconfig-2.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-util/jconfig/jconfig-2.5.ebuild,v 1.4 2004/08/27 11:30:17 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.5.ebuild,v 1.5 2004/10/16 18:16:50 axxo Exp $
 
 inherit java-pkg
 
@@ -30,7 +30,7 @@ src_install() {
 	insinto /usr/share/${PN}/lib
 	doins lib/*
 
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 
 	dodoc README
 }
diff --git a/dev-util/jconfig/jconfig-2.7.ebuild b/dev-util/jconfig/jconfig-2.7.ebuild
index 9cf46a357fd6..b4a150667983 100644
--- a/dev-util/jconfig/jconfig-2.7.ebuild
+++ b/dev-util/jconfig/jconfig-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.7.ebuild,v 1.1 2004/08/27 11:30:17 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.7.ebuild,v 1.2 2004/10/16 18:16:50 axxo Exp $
 
 inherit java-pkg
 
@@ -30,7 +30,7 @@ src_install() {
 	insinto /usr/share/${PN}/lib
 	doins lib/*
 
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 
 	dodoc README
 }
diff --git a/dev-util/jconfig/jconfig-2.8.ebuild b/dev-util/jconfig/jconfig-2.8.ebuild
index 2373aff7cd0c..9b7b4b0dd621 100644
--- a/dev-util/jconfig/jconfig-2.8.ebuild
+++ b/dev-util/jconfig/jconfig-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-util/jconfig/jconfig-2.8.ebuild,v 1.1 2004/09/01 07:43:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.8.ebuild,v 1.2 2004/10/16 18:16:50 axxo Exp $
 
 inherit java-pkg
 
@@ -30,7 +30,7 @@ src_install() {
 	insinto /usr/share/${PN}/lib
 	doins lib/*
 
-	use doc && dohtml -r javadoc/*
+	use doc && java-pkg_dohtml -r javadoc/*
 
 	dodoc README
 }
diff --git a/dev-util/pmd/ChangeLog b/dev-util/pmd/ChangeLog
index ff059e5c4b5e..0c46884ecdfd 100644
--- a/dev-util/pmd/ChangeLog
+++ b/dev-util/pmd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/pmd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.4 2004/09/17 13:49:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.5 2004/10/16 18:17:13 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> pmd-1.5-r1.ebuild,
+  pmd-1.5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *pmd-1.5-r1 (17 Sep 2004)
 
diff --git a/dev-util/pmd/pmd-1.5-r1.ebuild b/dev-util/pmd/pmd-1.5-r1.ebuild
index 94ee2c95b835..94cfdcb1c2b9 100644
--- a/dev-util/pmd/pmd-1.5-r1.ebuild
+++ b/dev-util/pmd/pmd-1.5-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-util/pmd/pmd-1.5-r1.ebuild,v 1.1 2004/09/17 13:49:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-1.5-r1.ebuild,v 1.2 2004/10/16 18:17:13 axxo Exp $
 
 inherit java-pkg
 
@@ -38,5 +38,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar etc/${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-util/pmd/pmd-1.5.ebuild b/dev-util/pmd/pmd-1.5.ebuild
index fee5f7b3d530..e934c2f27bf8 100644
--- a/dev-util/pmd/pmd-1.5.ebuild
+++ b/dev-util/pmd/pmd-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-util/pmd/pmd-1.5.ebuild,v 1.4 2004/08/30 18:37:23 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-1.5.ebuild,v 1.5 2004/10/16 18:17:13 axxo Exp $
 
 inherit java-pkg
 
@@ -25,5 +25,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar etc/${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-util/weka/ChangeLog b/dev-util/weka/ChangeLog
index 3038eb60366e..f19911640f2b 100644
--- a/dev-util/weka/ChangeLog
+++ b/dev-util/weka/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/weka
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/ChangeLog,v 1.4 2004/10/07 16:57:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/ChangeLog,v 1.5 2004/10/16 18:17:32 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> weka-3.4.1-r1.ebuild,
+  weka-3.4.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *weka-3.4.1-r1 (07 Oct 2004)
 
diff --git a/dev-util/weka/weka-3.4.1-r1.ebuild b/dev-util/weka/weka-3.4.1-r1.ebuild
index dc9e6468a7cd..4890a1bb1080 100644
--- a/dev-util/weka/weka-3.4.1-r1.ebuild
+++ b/dev-util/weka/weka-3.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-util/weka/weka-3.4.1-r1.ebuild,v 1.1 2004/10/07 16:57:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.4.1-r1.ebuild,v 1.2 2004/10/16 18:17:32 axxo Exp $
 
 inherit java-pkg
 
@@ -46,7 +46,7 @@ src_install() {
 
 	dodir /usr/share/${PN}/data/
 	cp data/* ${D}/usr/share/${PN}/data/ || die "failed to copy data"
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	dodoc README* COPYING CHANGELOG-${PV//./-}
 	cp *.pdf ${D}/usr/share/doc/${PF}/ || die "failed to copy docs"
 }
diff --git a/dev-util/weka/weka-3.4.1.ebuild b/dev-util/weka/weka-3.4.1.ebuild
index 3289ee692285..ae5dce5abccf 100644
--- a/dev-util/weka/weka-3.4.1.ebuild
+++ b/dev-util/weka/weka-3.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-util/weka/weka-3.4.1.ebuild,v 1.3 2004/08/30 18:39:32 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.4.1.ebuild,v 1.4 2004/10/16 18:17:32 axxo Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_install() {
 
 	dodir /usr/share/${PN}/data/
 	cp data/* ${D}/usr/share/${PN}/data/
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	dodoc README* COPYING CHANGELOG-${PV//./-}
 	cp *.pdf ${D}/usr/share/doc/${P}/
 }
diff --git a/dev-util/xdoclet-bin/ChangeLog b/dev-util/xdoclet-bin/ChangeLog
index 5364b777bfec..2ac253938194 100644
--- a/dev-util/xdoclet-bin/ChangeLog
+++ b/dev-util/xdoclet-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/xdoclet-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/ChangeLog,v 1.3 2004/08/30 18:42:16 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/ChangeLog,v 1.4 2004/10/16 18:17:52 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xdoclet-bin-1.2.1.ebuild,
+  xdoclet-bin-1.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *xdoclet-bin-1.2.1 (30 Aug 2004)
 
diff --git a/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild b/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild
index 1163b309f9a6..7fada509ce79 100644
--- a/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild
+++ b/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild,v 1.1 2004/08/30 18:42:16 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild,v 1.2 2004/10/16 18:17:52 axxo Exp $
 
 DESCRIPTION="XDoclet is a code generation engine."
 SRC_URI="mirror://sourceforge/xdoclet/${P}.tgz"
@@ -16,5 +16,5 @@ S=${WORKDIR}/${PN%%-bin}-${PV}
 
 src_install() {
 	dojar lib/*.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild b/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild
index c397a5cd5383..1fc8da3732d0 100644
--- a/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild
+++ b/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild,v 1.3 2004/08/30 18:42:16 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild,v 1.4 2004/10/16 18:17:52 axxo Exp $
 
 DESCRIPTION="XDoclet is a code generation engine."
 SRC_URI="mirror://sourceforge/xdoclet/${P}.tgz"
@@ -15,5 +15,5 @@ S=${WORKDIR}/${PN%%-bin}-${PV}
 
 src_install() {
 	dojar lib/*.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 2f1c5ee05eca..43abb77deb77 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.4 2004/09/07 16:11:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.5 2004/10/16 18:18:13 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> projectx-0.81.7.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   07 Sep 2004; <blubb@gentoo.org> projectx-0.81.7.ebuild:
   added ~amd64 keyword
diff --git a/media-video/projectx/projectx-0.81.7.ebuild b/media-video/projectx/projectx-0.81.7.ebuild
index 761aea9882a7..52b82f902950 100644
--- a/media-video/projectx/projectx-0.81.7.ebuild
+++ b/media-video/projectx/projectx-0.81.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.81.7.ebuild,v 1.4 2004/09/07 16:11:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.81.7.ebuild,v 1.5 2004/10/16 18:18:13 axxo Exp $
 
 inherit java-pkg
 
@@ -42,7 +42,7 @@ src_install() {
 
 	dodoc Copying *.txt
 
-	dohtml -r htmls/
+	java-pkg_dohtml -r htmls/
 	dobin ${MY_PN}
 }
 
diff --git a/net-misc/java-wakeonlan/ChangeLog b/net-misc/java-wakeonlan/ChangeLog
index fee9128b7fa5..e58dbba5f033 100644
--- a/net-misc/java-wakeonlan/ChangeLog
+++ b/net-misc/java-wakeonlan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/java-wakeonlan
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/ChangeLog,v 1.4 2004/08/30 18:46:39 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/ChangeLog,v 1.5 2004/10/16 18:18:31 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  java-wakeonlan-0.3.0.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> java-wakeonlan-0.3.0.ebuild:
   Marking x86
diff --git a/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild b/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild
index 0cebe3d1f70a..7de1e66736cb 100644
--- a/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild
+++ b/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild,v 1.4 2004/08/30 18:46:39 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild,v 1.5 2004/10/16 18:18:31 axxo Exp $
 
 inherit java-pkg
 
@@ -32,13 +32,10 @@ src_compile() {
 src_install() {
 	java-pkg_dojar deploy/wakeonlan.jar
 
-	local my_cp
-	my_cp=`java-config --classpath=commons-logging,commons-cli,java-wakeonlan`
-
 	echo "#!/bin/sh" > ${PN}
-	echo '${JAVA_HOME}'/bin/java -cp ${my_cp} wol.WakeOnLan '$*' >> ${PN}
+	echo '${JAVA_HOME}'/bin/java -cp '$(java-config -p commons-logging,commons-cli,java-wakeonlan)' wol.WakeOnLan '$*' >> ${PN}
 	dobin ${PN}
 
 	dodoc doc/README
-	use doc && dohtml -r deploy/doc/javadoc/*
+	use doc && java-pkg_dohtml -r deploy/doc/javadoc/*
 }