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

5 files changed, 23 insertions, 14 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/Manifest b/app-benchmarks/jmeter/Manifest
index 814149530a30..56e20de7baa5 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fa7313a97cc2a647c0c96fa22e04a2c2 jmeter-2.0.1-r1.ebuild 1875
-MD5 f5390c6cb85761accdea099590ca1423 jmeter-2.0.1.ebuild 1105
-MD5 0c8c4aa91015f7b715398b876defbc58 jmeter-1.9.1.ebuild 969
-MD5 e891682361f26ace6f950742e8be8fe9 ChangeLog 2545
+MD5 18834cd5e22f1c69c7efa25c59d2c639 jmeter-2.0.1-r1.ebuild 1884
+MD5 9336d453e6cf97d368a1d782574fa37d jmeter-2.0.1.ebuild 1132
+MD5 aac14a164c90ab641bbf162f92d02926 jmeter-1.9.1.ebuild 996
+MD5 0bb0872ffef504c080715e414f2080cb ChangeLog 2766
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a62f7266e5fa7c30d2b82af95a3fea55 files/digest-jmeter-1.9.1 74
 MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1 74
@@ -12,7 +12,7 @@ MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1-r1 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBbDIE/rLF9B432nYRAts+AJ4rBhexnEQ3xvpjkp/CGwj3+tiGtACeLM2y
-28OX1bIJ45DMVZe2KC0Rhfw=
-=/e8F
+iD8DBQFBcWTo/rLF9B432nYRAiqGAJ9oqmUuZNz1s58R2J7j8J7M72vvpwCgwduv
+Xp0oktHnxaGZHiO4bp3FyEw=
+=FDOn
 -----END PGP SIGNATURE-----
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/*
 }