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

42 files changed, 143 insertions, 71 deletions

diff --git a/dev-java/puretls/ChangeLog b/dev-java/puretls/ChangeLog
index 838c04af7b4d..8d99a3ba0467 100644
--- a/dev-java/puretls/ChangeLog
+++ b/dev-java/puretls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/puretls
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.2 2004/06/24 22:40:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.3 2004/10/16 17:32:30 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> puretls-0.94_beta4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *puretls-0.94_beta4 (16 May 2004)
 
diff --git a/dev-java/puretls/puretls-0.94_beta4.ebuild b/dev-java/puretls/puretls-0.94_beta4.ebuild
index 554d9f3f2da9..1ce89e254605 100644
--- a/dev-java/puretls/puretls-0.94_beta4.ebuild
+++ b/dev-java/puretls/puretls-0.94_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/puretls-0.94_beta4.ebuild,v 1.2 2004/06/24 22:40:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/puretls-0.94_beta4.ebuild,v 1.3 2004/10/16 17:32:30 axxo Exp $
 
 inherit java-pkg
 
@@ -36,5 +36,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar ${S}/build/${PN}.jar
 	dodoc ChangeLog CREDITS INSTALL LICENSE README
-	use doc && dohtml -r ${S}/build/doc/*
+	use doc && java-pkg_dohtml -r ${S}/build/doc/*
 }
diff --git a/dev-java/qat/ChangeLog b/dev-java/qat/ChangeLog
index 13abd161e4c9..ea3bbcf686b3 100644
--- a/dev-java/qat/ChangeLog
+++ b/dev-java/qat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/qat
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/ChangeLog,v 1.6 2004/10/06 22:12:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/ChangeLog,v 1.7 2004/10/16 17:32:49 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> qat-2.7.1-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *qat-2.7.1-r1 (07 Oct 2004)
 
diff --git a/dev-java/qat/qat-2.7.1-r1.ebuild b/dev-java/qat/qat-2.7.1-r1.ebuild
index 32d3e858e8bb..bde1d607b357 100644
--- a/dev-java/qat/qat-2.7.1-r1.ebuild
+++ b/dev-java/qat/qat-2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/qat-2.7.1-r1.ebuild,v 1.1 2004/10/06 22:12:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/qat-2.7.1-r1.ebuild,v 1.2 2004/10/16 17:32:49 axxo Exp $
 
 inherit java-pkg
 
@@ -39,6 +39,6 @@ src_install() {
 
 	dobin ${PN}
 
-	use doc && dohtml -r doc/* && dohtml -r specification/* && cp -R examples ${D}/usr/share/doc/${P}/
+	use doc && java-pkg_dohtml -r doc/* && dohtml -r specification/* && cp -R examples ${D}/usr/share/doc/${P}/
 }
 
diff --git a/dev-java/quartz/ChangeLog b/dev-java/quartz/ChangeLog
index 64f30948dc72..f443687e762c 100644
--- a/dev-java/quartz/ChangeLog
+++ b/dev-java/quartz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/quartz
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/ChangeLog,v 1.9 2004/09/05 07:12:52 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/ChangeLog,v 1.10 2004/10/16 17:33:10 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> quartz-1.3.4.ebuild,
+  quartz-1.4.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; Lim Swee Tat <st_lim@gentoo.org> quartz-1.4.0.ebuild:
   Using >= instead of = for dependencies
diff --git a/dev-java/quartz/quartz-1.3.4.ebuild b/dev-java/quartz/quartz-1.3.4.ebuild
index ddc4f771eed7..0597243bd1d4 100644
--- a/dev-java/quartz/quartz-1.3.4.ebuild
+++ b/dev-java/quartz/quartz-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.3.4.ebuild,v 1.9 2004/09/21 14:04:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.3.4.ebuild,v 1.10 2004/10/16 17:33:10 axxo Exp $
 
 inherit java-pkg
 
@@ -54,5 +54,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/quartz.jar
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/quartz/quartz-1.4.0.ebuild b/dev-java/quartz/quartz-1.4.0.ebuild
index 609507fd1195..975b790c440a 100644
--- a/dev-java/quartz/quartz-1.4.0.ebuild
+++ b/dev-java/quartz/quartz-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.0.ebuild,v 1.4 2004/09/21 14:04:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.0.ebuild,v 1.5 2004/10/16 17:33:10 axxo Exp $
 
 inherit java-pkg
 
@@ -54,5 +54,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/quartz.jar
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/radeox/ChangeLog b/dev-java/radeox/ChangeLog
index a851e956a38e..4e1e77a32d5c 100644
--- a/dev-java/radeox/ChangeLog
+++ b/dev-java/radeox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/radeox
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.5 2004/09/29 23:55:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.6 2004/10/16 17:33:29 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> radeox-1.0_beta2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   04 May 2004; David Holm <dholm@gentoo.org> radeox-1.0_beta2.ebuild:
   Added to ~ppc.
diff --git a/dev-java/radeox/radeox-1.0_beta2.ebuild b/dev-java/radeox/radeox-1.0_beta2.ebuild
index 0e5f2610f64c..652676affb57 100644
--- a/dev-java/radeox/radeox-1.0_beta2.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.4 2004/06/24 22:41:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.5 2004/10/16 17:33:29 axxo Exp $
 
 inherit java-pkg
 
@@ -44,6 +44,6 @@ src_compile() {
 
 src_install() {
 	dodoc Changes.txt README Radeox.version license.txt
-	use doc && dohtml -r docs/api
+	use doc && java-pkg_dohtml -r docs/api
 	java-pkg_dojar lib/{radeox,radeox-api}.jar
 }
diff --git a/dev-java/regexp/ChangeLog b/dev-java/regexp/ChangeLog
index b55dad939f8b..fe1f85fe8f97 100644
--- a/dev-java/regexp/ChangeLog
+++ b/dev-java/regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/regexp
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.15 2004/09/28 21:07:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.16 2004/10/16 17:33:48 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> regexp-1.3-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   28 Sep 2004; Thomas Matthijs <axxo@gentoo.org> regexp-1.3-r1.ebuild,
   regexp-1.3.ebuild:
diff --git a/dev-java/regexp/regexp-1.3-r1.ebuild b/dev-java/regexp/regexp-1.3-r1.ebuild
index e6f043d14ba5..16e3b57cf921 100644
--- a/dev-java/regexp/regexp-1.3-r1.ebuild
+++ b/dev-java/regexp/regexp-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/regexp-1.3-r1.ebuild,v 1.3 2004/09/28 21:07:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/regexp-1.3-r1.ebuild,v 1.4 2004/10/16 17:33:48 axxo Exp $
 
 inherit java-pkg
 
@@ -33,5 +33,5 @@ src_install() {
 	cd ${S}/build
 	mv jakarta-${P}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/api/*
+	use doc && java-pkg_dohtml -r docs/api/*
 }
diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index b261d407f081..ac19280afa17 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.18 2004/10/16 08:37:47 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.19 2004/10/16 17:34:07 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> rhino-1.5_rc5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> rhino-1.5_rc5.ebuild:
   Stable on amd64.
diff --git a/dev-java/rhino/rhino-1.5_rc5.ebuild b/dev-java/rhino/rhino-1.5_rc5.ebuild
index bfb63cac55d5..d5b4f64b35e5 100644
--- a/dev-java/rhino/rhino-1.5_rc5.ebuild
+++ b/dev-java/rhino/rhino-1.5_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc5.ebuild,v 1.11 2004/10/16 08:37:47 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc5.ebuild,v 1.12 2004/10/16 17:34:07 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -38,5 +38,5 @@ src_compile() {
 src_install() {
 	dobin ${FILESDIR}/jsscript
 	java-pkg_dojar build/*/js.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/sablecc-anttask/ChangeLog b/dev-java/sablecc-anttask/ChangeLog
index e47c15587f25..80541976ba18 100644
--- a/dev-java/sablecc-anttask/ChangeLog
+++ b/dev-java/sablecc-anttask/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sablecc-anttask
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/ChangeLog,v 1.1 2004/09/19 17:09:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/ChangeLog,v 1.2 2004/10/16 17:34:26 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  sablecc-anttask-1.1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *sablecc-anttask-1.1.0 (19 Sep 2004)
 
diff --git a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild
index e7154a00ef92..5524d451897d 100644
--- a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild
+++ b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild,v 1.1 2004/09/19 17:09:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc-anttask/sablecc-anttask-1.1.0.ebuild,v 1.2 2004/10/16 17:34:26 axxo Exp $
 
 inherit java-pkg
 
@@ -25,6 +25,6 @@ src_install() {
 	java-pkg_dojar lib/${PN}.jar
 	dodir /usr/share/ant-core/lib/
 	dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant-core/lib/
-	dohtml -r doc
+	java-pkg_dohtml -r doc
 	dodoc AUTHORS ChangeLog COPYING-LESSER LICENSE README
 }
diff --git a/dev-java/sax/ChangeLog b/dev-java/sax/ChangeLog
index 9f86c6e7aab8..a46b042715f6 100644
--- a/dev-java/sax/ChangeLog
+++ b/dev-java/sax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sax
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/ChangeLog,v 1.1 2004/09/21 19:35:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/ChangeLog,v 1.2 2004/10/16 17:34:45 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> sax-2.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *sax-2.2.1 (21 Sep 2004)
 
diff --git a/dev-java/sax/sax-2.2.1.ebuild b/dev-java/sax/sax-2.2.1.ebuild
index 55038c3cdc12..e0777400628c 100644
--- a/dev-java/sax/sax-2.2.1.ebuild
+++ b/dev-java/sax/sax-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/sax-2.2.1.ebuild,v 1.1 2004/09/21 19:35:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sax/sax-2.2.1.ebuild,v 1.2 2004/10/16 17:34:45 axxo Exp $
 
 inherit java-pkg
 
@@ -35,5 +35,5 @@ src_install() {
 	java-pkg_dojar ${PN}.jar
 	dodoc ChangeLog CHANGES README
 
-	use doc && dohtml -r docs/javadoc/*
+	use doc && java-pkg_dohtml -r docs/javadoc/*
 }
diff --git a/dev-java/saxon-bin/ChangeLog b/dev-java/saxon-bin/ChangeLog
index 40dab2832d31..558f9cd3cbb8 100644
--- a/dev-java/saxon-bin/ChangeLog
+++ b/dev-java/saxon-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/saxon-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/ChangeLog,v 1.2 2004/09/05 07:17:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/ChangeLog,v 1.3 2004/10/16 17:35:05 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> saxon-bin-6.5.3.ebuild,
+  saxon-bin-7.8.ebuild, saxon-bin-8.0b.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild b/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild
index 9220c2751893..148a883c7ef3 100644
--- a/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild
+++ b/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild,v 1.1 2004/07/30 21:46:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-6.5.3.ebuild,v 1.2 2004/10/16 17:35:05 axxo Exp $
 
 inherit java-pkg
 
@@ -19,6 +19,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/saxon-bin/saxon-bin-7.8.ebuild b/dev-java/saxon-bin/saxon-bin-7.8.ebuild
index ad7dd9f39d00..18866d5353fd 100644
--- a/dev-java/saxon-bin/saxon-bin-7.8.ebuild
+++ b/dev-java/saxon-bin/saxon-bin-7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-7.8.ebuild,v 1.1 2004/07/30 21:46:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-7.8.ebuild,v 1.2 2004/10/16 17:35:05 axxo Exp $
 
 inherit java-pkg
 
@@ -19,6 +19,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/saxon-bin/saxon-bin-8.0b.ebuild b/dev-java/saxon-bin/saxon-bin-8.0b.ebuild
index 2f0f0069f033..872c7f985546 100644
--- a/dev-java/saxon-bin/saxon-bin-8.0b.ebuild
+++ b/dev-java/saxon-bin/saxon-bin-8.0b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-8.0b.ebuild,v 1.1 2004/07/30 21:46:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon-bin/saxon-bin-8.0b.ebuild,v 1.2 2004/10/16 17:35:05 axxo Exp $
 
 inherit java-pkg
 
@@ -20,6 +20,6 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 	java-pkg_dojar *.jar
 }
diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog
index 35e9ead20a7f..e1c10574c31a 100644
--- a/dev-java/saxpath/ChangeLog
+++ b/dev-java/saxpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/saxpath
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.1 2004/09/17 13:59:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.2 2004/10/16 17:35:25 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> saxpath-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *saxpath-1.0 (17 Sep 2004)
 
diff --git a/dev-java/saxpath/saxpath-1.0.ebuild b/dev-java/saxpath/saxpath-1.0.ebuild
index 68a214b29c36..a73964bca60f 100644
--- a/dev-java/saxpath/saxpath-1.0.ebuild
+++ b/dev-java/saxpath/saxpath-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0.ebuild,v 1.1 2004/09/17 13:59:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0.ebuild,v 1.2 2004/10/16 17:35:25 axxo Exp $
 
 inherit java-pkg
 
@@ -42,5 +42,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/saxpath.jar
 
-	use doc && dohtml -r build/doc/*
+	use doc && java-pkg_dohtml -r build/doc/*
 }
diff --git a/dev-java/scala-bin/ChangeLog b/dev-java/scala-bin/ChangeLog
index b0628b73390c..a29fffc7e42c 100644
--- a/dev-java/scala-bin/ChangeLog
+++ b/dev-java/scala-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/scala-bin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.3 2004/09/28 00:31:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.4 2004/10/16 17:35:44 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> scala-bin-1.2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Gentoo Technologies, Inc. -> Gentoo Foundation
diff --git a/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild b/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild
index 786825c680a2..552871cfe14e 100644
--- a/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild
+++ b/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild,v 1.2 2004/08/02 17:36:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild,v 1.3 2004/10/16 17:35:44 axxo Exp $
 
 inherit java-pkg
 
@@ -43,7 +43,7 @@ src_install() {
 
 	java-pkg_dojar lib/*.jar
 
-	dohtml -r doc/api
+	java-pkg_dohtml -r doc/api
 	cp -r examples ${D}/usr/share/doc/${PF}
 	dodoc doc/*.pdf
 	dodoc LICENSE README VERSION
diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index 63843e28b542..e39371e25bac 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/servletapi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.15 2004/06/24 22:42:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.16 2004/10/16 17:36:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> servletapi-2.2-r1.ebuild,
+  servletapi-2.3-r1.ebuild, servletapi-2.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> servletapi-2.2-r1.ebuild,
   servletapi-2.3-r1.ebuild, servletapi-2.4.ebuild:
diff --git a/dev-java/servletapi/servletapi-2.2-r1.ebuild b/dev-java/servletapi/servletapi-2.2-r1.ebuild
index f8bb76fb69a3..47ce3446a14c 100644
--- a/dev-java/servletapi/servletapi-2.2-r1.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r1.ebuild,v 1.3 2004/06/24 22:42:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r1.ebuild,v 1.4 2004/10/16 17:36:03 axxo Exp $
 
 inherit java-pkg
 
@@ -33,7 +33,7 @@ src_install () {
 	java-pkg_dojar servletapi/lib/${PN}-${PV}.jar || die "Unable to install"
 
 	if use doc ; then
-		dohtml -r servletapi/docs/*
+		java-pkg_dohtml -r servletapi/docs/*
 	fi
 
 	dodoc dist/README.txt
diff --git a/dev-java/servletapi/servletapi-2.3-r1.ebuild b/dev-java/servletapi/servletapi-2.3-r1.ebuild
index c4c5d2555f20..6d59a193a003 100644
--- a/dev-java/servletapi/servletapi-2.3-r1.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r1.ebuild,v 1.3 2004/06/24 22:42:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r1.ebuild,v 1.4 2004/10/16 17:36:03 axxo Exp $
 
 inherit java-pkg
 
@@ -31,7 +31,7 @@ src_install () {
 	java-pkg_dojar dist/lib/${PN}-${PV}.jar || die "Unable to install"
 
 	if use doc ; then
-		dohtml -r dist/docs/*
+		java-pkg_dohtml -r dist/docs/*
 	fi
 
 	dodoc dist/README.txt
diff --git a/dev-java/servletapi/servletapi-2.4.ebuild b/dev-java/servletapi/servletapi-2.4.ebuild
index b81d8396f1dd..c13b7d84b955 100644
--- a/dev-java/servletapi/servletapi-2.4.ebuild
+++ b/dev-java/servletapi/servletapi-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4.ebuild,v 1.12 2004/09/21 14:06:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4.ebuild,v 1.13 2004/10/16 17:36:03 axxo Exp $
 
 inherit java-pkg
 
@@ -42,6 +42,6 @@ src_install () {
 
 	cd ${S}
 	java-pkg_dojar *.jar || die "Unable to install"
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/soap/ChangeLog b/dev-java/soap/ChangeLog
index bd41460105a7..46757f8f232a 100644
--- a/dev-java/soap/ChangeLog
+++ b/dev-java/soap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/soap
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.1 2004/09/12 19:32:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.2 2004/10/16 17:36:22 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> soap-2.3.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *soap-2.3.1 (12 Sep 2004)
 
diff --git a/dev-java/soap/soap-2.3.1.ebuild b/dev-java/soap/soap-2.3.1.ebuild
index ed553c16c4bc..9503b41d1271 100644
--- a/dev-java/soap/soap-2.3.1.ebuild
+++ b/dev-java/soap/soap-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/soap-2.3.1.ebuild,v 1.1 2004/09/12 19:32:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/soap-2.3.1.ebuild,v 1.2 2004/10/16 17:36:22 axxo Exp $
 
 inherit java-pkg
 DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
@@ -30,5 +30,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/lib/soap.jar
 
-	use doc && dohtml -r build/javadocs/
+	use doc && java-pkg_dohtml -r build/javadocs/
 }
diff --git a/dev-java/struts-legacy/ChangeLog b/dev-java/struts-legacy/ChangeLog
index 7701b6552b20..8d01ebfa5629 100644
--- a/dev-java/struts-legacy/ChangeLog
+++ b/dev-java/struts-legacy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/struts-legacy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.6 2004/10/03 13:48:55 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.7 2004/10/16 17:37:03 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  struts-legacy-1.0-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   03 Oct 2004; Karl Trygve Kalleberg <karltk@gentoo.org> struts-legacy-1.0-r1.ebuild:
   jdbc2-stdext is present in 1.4, and is only needed for 1.3 vms. Removed old 
diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
index 6c155d79e67b..82bc4985b004 100644
--- a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
+++ b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.5 2004/10/03 13:53:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.6 2004/10/16 17:37:03 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar dist/*.jar
 	dodoc STATUS.txt
-	use doc && dohtml -r dist/docs/
+	use doc && java-pkg_dohtml -r dist/docs/
 }
diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 49072c2e0cb0..ac1fb506951e 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.10 2004/10/12 20:44:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.11 2004/10/16 17:36:44 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> struts-1.1-r1.ebuild,
+  struts-1.1-r2.ebuild, struts-1.1.ebuild, struts-1.2.2-r1.ebuild,
+  struts-1.2.2.ebuild, struts-1.2.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> struts-1.2.2-r1.ebuild,
   struts-1.2.2.ebuild, struts-1.2.4.ebuild:
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
index 7d66581d67cd..70ebc6b299b4 100644
--- a/dev-java/struts/struts-1.1-r1.ebuild
+++ b/dev-java/struts/struts-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.6 2004/09/12 17:11:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.7 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 	dodoc README STATUS
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.1-r2.ebuild b/dev-java/struts/struts-1.1-r2.ebuild
index a2b1aced5417..c8551ad0a2a1 100644
--- a/dev-java/struts/struts-1.1-r2.ebuild
+++ b/dev-java/struts/struts-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r2.ebuild,v 1.1 2004/10/08 17:05:43 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r2.ebuild,v 1.2 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -56,5 +56,5 @@ src_install() {
 	doins target/library/*.tld
 
 	dodoc README STATUS
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.1.ebuild b/dev-java/struts/struts-1.1.ebuild
index 16c8f95a7da3..f23c1b2ffb26 100644
--- a/dev-java/struts/struts-1.1.ebuild
+++ b/dev-java/struts/struts-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1.ebuild,v 1.5 2004/07/26 10:47:57 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1.ebuild,v 1.6 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 	dodoc README STATUS
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.2.2-r1.ebuild b/dev-java/struts/struts-1.2.2-r1.ebuild
index b6176ed11f71..72b580298639 100644
--- a/dev-java/struts/struts-1.2.2-r1.ebuild
+++ b/dev-java/struts/struts-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r1.ebuild,v 1.2 2004/10/12 20:44:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r1.ebuild,v 1.3 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -56,5 +56,5 @@ src_install() {
 	doins target/library/*.tld
 
 	dodoc README STATUS.txt
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.2.2.ebuild b/dev-java/struts/struts-1.2.2.ebuild
index 660a42416528..8fc8633e1368 100644
--- a/dev-java/struts/struts-1.2.2.ebuild
+++ b/dev-java/struts/struts-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2.ebuild,v 1.3 2004/10/12 20:44:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2.ebuild,v 1.4 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -51,5 +51,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 	dodoc README STATUS.txt
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/struts/struts-1.2.4.ebuild b/dev-java/struts/struts-1.2.4.ebuild
index c1e6717bc9ac..37add05eb6c7 100644
--- a/dev-java/struts/struts-1.2.4.ebuild
+++ b/dev-java/struts/struts-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4.ebuild,v 1.3 2004/10/15 06:45:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4.ebuild,v 1.4 2004/10/16 17:36:44 axxo Exp $
 
 inherit java-pkg
 
@@ -56,5 +56,5 @@ src_install() {
 	doins target/library/*.tld
 
 	dodoc README STATUS.txt
-	use doc && dohtml -r target/documentation/
+	use doc && java-pkg_dohtml -r target/documentation/
 }
diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index 603e87235b1f..b1cd4d1876d9 100644
--- a/dev-java/sun-j2ee/ChangeLog
+++ b/dev-java/sun-j2ee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-j2ee
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.15 2004/07/02 04:23:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.16 2004/10/16 17:37:24 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2ee-1.3.1-r2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sun-j2ee-1.3.1-r2.ebuild:
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
index 38992d5cffd8..7c32889f4e0b 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild,v 1.3 2004/07/02 04:23:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild,v 1.4 2004/10/16 17:37:24 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Sun's Java 2 Enterprise Edition Development Kit"
 SRC_URI="j2sdkee-1_3_1-linux.tar.gz"
@@ -29,16 +31,15 @@ src_install () {
 		cp -a $i ${D}/opt/${P}/
 	done
 
-	# Setup env vars
-	addwrite /etc/env.d/29${P}
-	j2eeenv=/etc/env.d/29${P}
+	dodir /etc/env.d/
+	local j2eeenv=${D}/etc/env.d/29${P}
 	echo "CLASSPATH=/opt/${P}/lib/j2ee.jar" > $j2eeenv
 	echo "PATH=/opt/${P}/bin" >> $j2eeenv
 	echo "J2EE_HOME=/opt/${P}" >> $j2eeenv
 	dodoc LICENSE README
 
 	if use doc ; then
-		dohtml -r doc/*
+		java-pkg_dohtml -r doc/*
 	fi
 }