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

39 files changed, 141 insertions, 68 deletions

diff --git a/dev-java/edtftpj/ChangeLog b/dev-java/edtftpj/ChangeLog
index 941d90fa3705..daf5cf1fe784 100644
--- a/dev-java/edtftpj/ChangeLog
+++ b/dev-java/edtftpj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/edtftpj
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/ChangeLog,v 1.4 2004/08/24 04:08:02 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/ChangeLog,v 1.5 2004/10/16 17:12:04 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> edtftpj-1.4.2.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *edtftpj-1.4.2 (24 Aug 2004)
 
diff --git a/dev-java/edtftpj/edtftpj-1.4.2.ebuild b/dev-java/edtftpj/edtftpj-1.4.2.ebuild
index 7e2c570ffdf7..ff52d97ed0af 100644
--- a/dev-java/edtftpj/edtftpj-1.4.2.ebuild
+++ b/dev-java/edtftpj/edtftpj-1.4.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/edtftpj/edtftpj-1.4.2.ebuild,v 1.1 2004/08/24 04:08:02 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.2.ebuild,v 1.2 2004/10/16 17:12:04 axxo Exp $
 
 inherit java-pkg
 
@@ -26,7 +26,7 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	use doc && dohtml -r build/doc/api
+	use doc && java-pkg_dohtml -r build/doc/api
 	dodoc doc/*.TXT
 	insinto /usr/share/doc/${PF}
 	doins doc/*.pdf
diff --git a/dev-java/fastutil/ChangeLog b/dev-java/fastutil/ChangeLog
index 97db58616672..9bec19da6ade 100644
--- a/dev-java/fastutil/ChangeLog
+++ b/dev-java/fastutil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fastutil
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/ChangeLog,v 1.6 2004/06/27 17:36:13 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/ChangeLog,v 1.7 2004/10/16 17:12:23 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fastutil-4.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> fastutil-4.1.ebuild:
   Marking stable on ppc
diff --git a/dev-java/fastutil/fastutil-4.1.ebuild b/dev-java/fastutil/fastutil-4.1.ebuild
index e638064d50d8..c68872ea49bb 100644
--- a/dev-java/fastutil/fastutil-4.1.ebuild
+++ b/dev-java/fastutil/fastutil-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/fastutil/fastutil-4.1.ebuild,v 1.6 2004/06/27 17:36:13 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.1.ebuild,v 1.7 2004/10/16 17:12:23 axxo Exp $
 
 inherit java-pkg
 
@@ -27,7 +27,7 @@ src_compile() {
 src_install() {
 	mv ${P}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	dodoc CHANGES README
 }
 
diff --git a/dev-java/fesi-bin/ChangeLog b/dev-java/fesi-bin/ChangeLog
index 15775c4af1f6..533d1285ae30 100644
--- a/dev-java/fesi-bin/ChangeLog
+++ b/dev-java/fesi-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fesi-bin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/ChangeLog,v 1.2 2004/09/05 07:06:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/ChangeLog,v 1.3 2004/10/16 17:12:42 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fesi-bin-1.1.5.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/fesi-bin/fesi-bin-1.1.5.ebuild b/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild
index be05f497b690..83f492d3ee01 100644
--- a/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild
+++ b/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild,v 1.1 2004/07/30 19:46:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi-bin/fesi-bin-1.1.5.ebuild,v 1.2 2004/10/16 17:12:42 axxo Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ src_install() {
 	java-pkg_dojar fesi.jar
 	dodoc Readme.txt
 	if use doc ; then
-		dohtml -r doc/html/*
+		java-pkg_dohtml -r doc/html/*
 		cp -r examples ${D}/usr/share/${PN/-bin}
 		cp -r tests ${D}/usr/share/${PN/-bin}
 	fi
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 0138330bc0aa..9fef18c79dc1 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.8 2004/10/16 08:44:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.9 2004/10/16 17:13:01 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fop-0.20.5.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> fop-0.20.5.ebuild:
   Stable on amd64.
diff --git a/dev-java/fop/fop-0.20.5.ebuild b/dev-java/fop/fop-0.20.5.ebuild
index d03ce6869c32..2005228c3c5b 100644
--- a/dev-java/fop/fop-0.20.5.ebuild
+++ b/dev-java/fop/fop-0.20.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/fop/fop-0.20.5.ebuild,v 1.9 2004/10/16 08:44:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5.ebuild,v 1.10 2004/10/16 17:13:01 axxo Exp $
 
 inherit java-pkg
 
@@ -43,6 +43,6 @@ src_install () {
 		dohtml ReleaseNotes.html
 		dodir /usr/share/doc/${P}
 		cp -a examples ${D}/usr/share/doc/${P}
-		dohtml -r build/javadocs
+		java-pkg_dohtml -r build/javadocs
 	fi
 }
diff --git a/dev-java/fscript/ChangeLog b/dev-java/fscript/ChangeLog
index 7fcf99c66fab..0cd3c2254260 100644
--- a/dev-java/fscript/ChangeLog
+++ b/dev-java/fscript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/fscript
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/ChangeLog,v 1.4 2004/06/24 22:26:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/ChangeLog,v 1.5 2004/10/16 17:13:20 axxo Exp $
+
+*fscript-1.15 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> fscript-1.14.ebuild,
+  fscript-1.15.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> :
   Version bump
diff --git a/dev-java/fscript/fscript-1.14.ebuild b/dev-java/fscript/fscript-1.14.ebuild
index 649fb28c0d42..bc8c7dac1645 100644
--- a/dev-java/fscript/fscript-1.14.ebuild
+++ b/dev-java/fscript/fscript-1.14.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/fscript/fscript-1.14.ebuild,v 1.3 2004/06/24 22:26:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/fscript-1.14.ebuild,v 1.4 2004/10/16 17:13:20 axxo Exp $
 
 inherit java-pkg
 
@@ -25,5 +25,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar *.jar
 	dodoc CREDITS README VERSION
-	use doc && dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
+	use doc && java-pkg_dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
 }
diff --git a/dev-java/fscript/fscript-1.15.ebuild b/dev-java/fscript/fscript-1.15.ebuild
index 8e4a0e4ed228..807b636b6dac 100644
--- a/dev-java/fscript/fscript-1.15.ebuild
+++ b/dev-java/fscript/fscript-1.15.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/fscript/fscript-1.15.ebuild,v 1.2 2004/06/24 22:26:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fscript/fscript-1.15.ebuild,v 1.3 2004/10/16 17:13:20 axxo Exp $
 
 inherit java-pkg
 
@@ -26,5 +26,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar *.jar
 	dodoc CREDITS README VERSION
-	use doc && dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
+	use doc && java-pkg_dohtml -r docs/ && cp -r examples/ ${D}/usr/share/${PN}/
 }
diff --git a/dev-java/gnu-activation/ChangeLog b/dev-java/gnu-activation/ChangeLog
index 1831d8b81a33..2b4fd981e9f5 100644
--- a/dev-java/gnu-activation/ChangeLog
+++ b/dev-java/gnu-activation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-activation
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-activation/ChangeLog,v 1.6 2004/09/29 23:55:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-activation/ChangeLog,v 1.7 2004/10/16 17:13:39 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-activation-20040331.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> gnu-activation-20040331.ebuild:
   Marking x86
diff --git a/dev-java/gnu-activation/gnu-activation-20040331.ebuild b/dev-java/gnu-activation/gnu-activation-20040331.ebuild
index e2bd4b0952fb..f36e79e0a35a 100644
--- a/dev-java/gnu-activation/gnu-activation-20040331.ebuild
+++ b/dev-java/gnu-activation/gnu-activation-20040331.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/gnu-activation/gnu-activation-20040331.ebuild,v 1.4 2004/08/24 04:12:29 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-activation/gnu-activation-20040331.ebuild,v 1.5 2004/10/16 17:13:39 axxo Exp $
 
 inherit java-pkg
 
@@ -28,6 +28,6 @@ src_install() {
 	java-pkg_dojar activation.jar
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
 
diff --git a/dev-java/gnu-classpath-inetlib/ChangeLog b/dev-java/gnu-classpath-inetlib/ChangeLog
index d8c07adc44a1..faf63c392dcc 100644
--- a/dev-java/gnu-classpath-inetlib/ChangeLog
+++ b/dev-java/gnu-classpath-inetlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-classpath-inetlib
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.7 2004/09/29 23:51:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.8 2004/10/16 17:13:58 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-classpath-inetlib-1.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Aug 2004; David Holm <dholm@gentoo.org> gnu-classpath-inetlib-1.0.ebuild:
   Added to ~ppc.
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild
index 57fd42bdfc66..e4d54dae0818 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-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/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild,v 1.2 2004/08/01 12:36:53 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild,v 1.3 2004/10/16 17:13:58 axxo Exp $
 
 inherit java-pkg
 
@@ -56,6 +56,6 @@ src_install() {
 	einstall || die
 	rm -rf ${D}/usr/share/java
 	java-pkg_dojar inetlib.jar
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 	dodoc AUTHORS COPYING NEWS README
 }
diff --git a/dev-java/gnu-crypto/ChangeLog b/dev-java/gnu-crypto/ChangeLog
index a13f8444cacf..eed8724690be 100644
--- a/dev-java/gnu-crypto/ChangeLog
+++ b/dev-java/gnu-crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-crypto
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.5 2004/09/29 23:56:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.6 2004/10/16 17:14:17 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> gnu-crypto-2.0.1.ebuild:
   Marking x86
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild
index 012dd2142e19..2298cc13fa4d 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-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/gnu-crypto/gnu-crypto-2.0.1.ebuild,v 1.6 2004/08/24 04:15:23 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1.ebuild,v 1.7 2004/10/16 17:14:17 axxo Exp $
 
 inherit java-pkg
 
@@ -36,7 +36,7 @@ src_install() {
 	java-pkg_dojar security/javax-security.jar
 
 	if use doc ; then
-		dohtml -r api/*
+		java-pkg_dohtml -r api/*
 	fi
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
diff --git a/dev-java/gnu-javamail/ChangeLog b/dev-java/gnu-javamail/ChangeLog
index e3b27f3f517d..153c61cad8cf 100644
--- a/dev-java/gnu-javamail/ChangeLog
+++ b/dev-java/gnu-javamail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-javamail
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.7 2004/09/29 23:58:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.8 2004/10/16 17:14:36 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-javamail-20040331.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   01 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   javamail-20030331.ebuild: Fixed dep on gnu-classpath-inetlib.
diff --git a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild b/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
index 9dbc26801e9b..27f00996ebc3 100644
--- a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-20040331.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/gnu-javamail/gnu-javamail-20040331.ebuild,v 1.6 2004/08/01 10:43:26 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild,v 1.7 2004/10/16 17:14:36 axxo Exp $
 
 inherit java-pkg
 
@@ -41,5 +41,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar gnumail.jar gnumail-providers.jar || die
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README.*
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/gnu-jaxp/ChangeLog b/dev-java/gnu-jaxp/ChangeLog
index aca777e8949d..eb4c785bb2ee 100644
--- a/dev-java/gnu-jaxp/ChangeLog
+++ b/dev-java/gnu-jaxp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-jaxp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/ChangeLog,v 1.5 2004/09/22 22:00:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/ChangeLog,v 1.6 2004/10/16 17:14:56 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  gnu-jaxp-1.0_beta1-r1.ebuild, gnu-jaxp-1.0_beta1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *gnu-jaxp-1.0_beta1-r1 (23 Sep 2004)
 
diff --git a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild
index 19d4aad94d43..69fd3e11f80c 100644
--- a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild
+++ b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-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/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild,v 1.1 2004/09/22 22:00:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1-r1.ebuild,v 1.2 2004/10/16 17:14:56 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -26,5 +26,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar gnujaxp.jar || die "Unable to Install"
 	dodoc README
-	use doc && dohtml -r apidoc/*
+	use doc && java-pkg_dohtml -r apidoc/*
 }
diff --git a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild
index 0a8d373c24b0..544345a3e863 100644
--- a/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild
+++ b/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.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/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild,v 1.6 2004/06/24 22:27:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaxp/gnu-jaxp-1.0_beta1.ebuild,v 1.7 2004/10/16 17:14:56 axxo Exp $
 
 inherit java-pkg
 
@@ -21,5 +21,5 @@ src_compile() { :; }
 src_install () {
 	java-pkg_dojar gnujaxp.jar || die "Unable to Install"
 	dodoc README
-	use doc && dohtml -r apidoc/*
+	use doc && java-pkg_dohtml -r apidoc/*
 }
diff --git a/dev-java/gnu-regexp/ChangeLog b/dev-java/gnu-regexp/ChangeLog
index 7f7c3dfee779..f4359df81e66 100644
--- a/dev-java/gnu-regexp/ChangeLog
+++ b/dev-java/gnu-regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-regexp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/ChangeLog,v 1.6 2004/06/24 22:28:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/ChangeLog,v 1.7 2004/10/16 17:15:14 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> gnu-regexp-1.1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> gnu-regexp-1.1.4.ebuild:
   Header fix
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
index 1f0082f6bb8f..7ec3379dfbb7 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4.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/gnu-regexp/gnu-regexp-1.1.4.ebuild,v 1.7 2004/07/14 01:58:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild,v 1.8 2004/10/16 17:15:14 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="GNU regular expression package for Java"
 HOMEPAGE="http://www.cacas.org/java/gnu/regexp/"
@@ -13,18 +15,14 @@ DEPEND=">=virtual/jdk-1.2"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
 src_compile() {
 	patch src/Makefile ${FILESDIR}/${PV}/Makefile.diff
 	cd src
-	make
+	make || die "failed too build"
 }
 
 src_install () {
-	dojar lib/gnu-regexp-${PV}.jar
+	java-pkg_dojar lib/gnu-regexp-${PV}.jar
 	dodoc COPYING.LIB README TODO
-	dohtml docs/* -r
+	java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index bc102b9ea62b..adaea623c789 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.7 2004/09/29 23:53:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.8 2004/10/16 17:15:35 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> groovy-1.0_beta4-r1.ebuild,
+  groovy-1.0_beta4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
   08 Aug 2004; Stuart Herbert <stuart@gentoo.org> groovy-1.0_beta4-r1.ebuild,
   groovy-1.0_beta4.ebuild:
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
index 5d2da49c648f..7ec642f7ae0f 100644
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4-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/groovy/groovy-1.0_beta4-r1.ebuild,v 1.4 2004/08/08 21:18:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.5 2004/10/16 17:15:35 axxo Exp $
 
 inherit java-pkg
 
@@ -109,7 +109,7 @@ src_install() {
 
 	# Install API documentation
 	if use doc ; then
-		dohtml -r dist/docs/api
+		java-pkg_dohtml -r dist/docs/api
 	fi
 
 	# Install configuration files
diff --git a/dev-java/groovy/groovy-1.0_beta4.ebuild b/dev-java/groovy/groovy-1.0_beta4.ebuild
index 866972ff50b5..5f044cb0fa5c 100644
--- a/dev-java/groovy/groovy-1.0_beta4.ebuild
+++ b/dev-java/groovy/groovy-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/groovy/groovy-1.0_beta4.ebuild,v 1.3 2004/08/08 21:18:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4.ebuild,v 1.4 2004/10/16 17:15:35 axxo Exp $
 
 inherit java-pkg
 
@@ -63,6 +63,6 @@ src_install() {
 	dodoc LICENSE.txt
 	java-pkg_dojar target/groovy-1.0-beta-2.jar
 	if use doc ; then
-		dohtml -r dist/docs/api
+		java-pkg_dohtml -r dist/docs/api
 	fi
 }
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 0271bf07fde2..2fe6a7dd5ab2 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.11 2004/08/11 14:47:35 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.12 2004/10/16 17:15:55 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> hibernate-2.1.4.ebuild,
+  hibernate-2.1.6.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *hibernate-2.1.6 (11 Aug 2004)
 
diff --git a/dev-java/hibernate/hibernate-2.1.4.ebuild b/dev-java/hibernate/hibernate-2.1.4.ebuild
index 820e5b6646fa..398f41df9d26 100644
--- a/dev-java/hibernate/hibernate-2.1.4.ebuild
+++ b/dev-java/hibernate/hibernate-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.4.ebuild,v 1.6 2004/07/09 03:23:31 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.4.ebuild,v 1.7 2004/10/16 17:15:55 axxo Exp $
 
 inherit java-pkg
 
@@ -31,5 +31,5 @@ src_install() {
 	dodoc *.txt lib/c3p0*.txt
 	insinto /usr/share/doc/${P}/sample
 	doins src/*.xml src/*.properties src/*.ccf src/META-INF/ra.xml
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/hibernate/hibernate-2.1.6.ebuild b/dev-java/hibernate/hibernate-2.1.6.ebuild
index bebe174c78bb..7bd8b2d2620c 100644
--- a/dev-java/hibernate/hibernate-2.1.6.ebuild
+++ b/dev-java/hibernate/hibernate-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.6.ebuild,v 1.1 2004/08/11 14:47:35 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.6.ebuild,v 1.2 2004/10/16 17:15:55 axxo Exp $
 
 inherit java-pkg
 
@@ -31,5 +31,5 @@ src_install() {
 	dodoc *.txt lib/c3p0*.txt
 	insinto /usr/share/doc/${P}/sample
 	doins src/*.xml src/*.properties src/*.ccf src/META-INF/ra.xml
-	use doc && dohtml -r doc/*
+	use doc && java-pkg_dohtml -r doc/*
 }
diff --git a/dev-java/htmlparser/ChangeLog b/dev-java/htmlparser/ChangeLog
index 259857a3670f..185a1e424144 100644
--- a/dev-java/htmlparser/ChangeLog
+++ b/dev-java/htmlparser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/htmlparser
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/ChangeLog,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/ChangeLog,v 1.2 2004/10/16 17:16:15 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> htmlparser-1.3.ebuild,
+  htmlparser-1.4.20040104.ebuild, htmlparser-1.4.20040727.ebuild,
+  htmlparser-1.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *htmlparser-1.4 (17 Sep 2004)
 
diff --git a/dev-java/htmlparser/htmlparser-1.3.ebuild b/dev-java/htmlparser/htmlparser-1.3.ebuild
index 35b92a8cd6ad..6288e8adfa43 100644
--- a/dev-java/htmlparser/htmlparser-1.3.ebuild
+++ b/dev-java/htmlparser/htmlparser-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/htmlparser/htmlparser-1.3.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.3.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar release/${MY_P}/lib/htmlparser.jar
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild b/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild
index 76d7d8b4d3ad..40ae473cb4e9 100644
--- a/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4.20040104.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/htmlparser/htmlparser-1.4.20040104.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.20040104.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/{htmllexer.jar,htmlparser.jar}
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild b/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild
index b409bf9eca2c..760d437e3047 100644
--- a/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4.20040727.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/htmlparser/htmlparser-1.4.20040727.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.20040727.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/{htmllexer.jar,htmlparser.jar}
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/htmlparser/htmlparser-1.4.ebuild b/dev-java/htmlparser/htmlparser-1.4.ebuild
index 5f64fb52ec34..c7b4c833f26c 100644
--- a/dev-java/htmlparser/htmlparser-1.4.ebuild
+++ b/dev-java/htmlparser/htmlparser-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/htmlparser/htmlparser-1.4.ebuild,v 1.1 2004/09/17 09:40:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.ebuild,v 1.2 2004/10/16 17:16:15 axxo Exp $
 
 inherit java-pkg
 
@@ -37,5 +37,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar lib/{htmllexer.jar,htmlparser.jar}
 	dodoc readme.txt
-	use doc && dohtml -r docs/
+	use doc && java-pkg_dohtml -r docs/
 }
diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 1fc3a79dd38d..c153c8ab0f23 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icu4j
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.1 2004/09/19 14:51:40 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.2 2004/10/16 17:16:34 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> icu4j-3.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
 
 *icu4j-3.0 (19 Sep 2004)
 
diff --git a/dev-java/icu4j/icu4j-3.0.ebuild b/dev-java/icu4j/icu4j-3.0.ebuild
index 4eb0f6134b9e..83b3655b8584 100644
--- a/dev-java/icu4j/icu4j-3.0.ebuild
+++ b/dev-java/icu4j/icu4j-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/dev-java/icu4j/icu4j-3.0.ebuild,v 1.1 2004/09/19 14:51:40 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.0.ebuild,v 1.2 2004/10/16 17:16:34 axxo Exp $
 
 inherit java-pkg
 
@@ -36,5 +36,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${PN}.jar
 
-	use doc && dohtml -r readme.html docs/*
+	use doc && java-pkg_dohtml -r readme.html docs/*
 }
diff --git a/dev-java/infobus-bin/ChangeLog b/dev-java/infobus-bin/ChangeLog
index 45a4ad128cad..b6620ef45284 100644
--- a/dev-java/infobus-bin/ChangeLog
+++ b/dev-java/infobus-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/infobus-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus-bin/ChangeLog,v 1.2 2004/09/05 07:06:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus-bin/ChangeLog,v 1.3 2004/10/16 17:16:52 axxo Exp $
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> infobus-bin-1.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/infobus-bin/infobus-bin-1.2.ebuild b/dev-java/infobus-bin/infobus-bin-1.2.ebuild
index 589dfe6bebb9..8786952981b9 100644
--- a/dev-java/infobus-bin/infobus-bin-1.2.ebuild
+++ b/dev-java/infobus-bin/infobus-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-java/infobus-bin/infobus-bin-1.2.ebuild,v 1.1 2004/07/30 19:52:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus-bin/infobus-bin-1.2.ebuild,v 1.2 2004/10/16 17:16:52 axxo Exp $
 
 inherit java-pkg
 
@@ -37,7 +37,7 @@ src_unpack() {
 src_compile() { :; }
 
 src_install() {
-	use doc && dohtml -r doc/
+	use doc && java-pkg_dohtml -r doc/
 	dohtml *.html
 	java-pkg_dojar infobus.jar
 }