Fixed dependencies to account for java-strict.

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 20 insertions, 21 deletions

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index 444c3e6f98b2..baf71177011d 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-benchmarks/jmeter
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.25 2006/07/24 11:03:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.26 2006/08/05 21:42:43 nichoj Exp $
+
+  05 Aug 2006; Joshua Nichols <nichoj@gentoo.org> jmeter-2.0.1-r1.ebuild:
+  Fixed dependencies to account for java-strict.
 
   24 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   files/digest-jmeter-1.9.1, Manifest:
diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index 378c53f92ff8..3119124b91f3 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST jakarta-jmeter-1.9.1.src.tgz 5743843 RMD160 53ad2d672e6de05ae2a491a99376578f446ea281 SHA1 0c9c952b71d0026180b0c37bc5e526947dc733a3 SHA256 8194638ce0e420574a0db4866fa617240912bfee7b0fc2d3465dc17f2fb75a51
 DIST jakarta-jmeter-2.0.1_src.tgz 5368483 RMD160 ec4db77dfd2205115e8206548da34db80dec24ea SHA1 69242001ab710b6a255bda72cfef329131f1cb3f SHA256 8dc7b0ff680af721adeeab198f7dc99f5e376df04c2504291564cfaccdcf5f36
 EBUILD jmeter-1.9.1.ebuild 1069 RMD160 98b5d678338080bf583b6165a695ee6aceea276b SHA1 4a0d435978401bdda967d2fc7ce09100cbae439f SHA256 c1adc3c397ff93fab8df487b24f0e92124416f02b84744c2510552da277b4e48
 MD5 96c3bf14667e971d031c523828961aa3 jmeter-1.9.1.ebuild 1069
 RMD160 98b5d678338080bf583b6165a695ee6aceea276b jmeter-1.9.1.ebuild 1069
 SHA256 c1adc3c397ff93fab8df487b24f0e92124416f02b84744c2510552da277b4e48 jmeter-1.9.1.ebuild 1069
-EBUILD jmeter-2.0.1-r1.ebuild 1032 RMD160 9a76cf7054d35e3225a6b69731e2059c2328a34c SHA1 09e50f89b0e46de67f76ba3e41eed8698da76e3d SHA256 edf4984499da5f5982ad371dac5597f4c1bc25b6867cc0701468e2c4865bacaa
-MD5 879e16b526603d2d3bf8597e4382319b jmeter-2.0.1-r1.ebuild 1032
-RMD160 9a76cf7054d35e3225a6b69731e2059c2328a34c jmeter-2.0.1-r1.ebuild 1032
-SHA256 edf4984499da5f5982ad371dac5597f4c1bc25b6867cc0701468e2c4865bacaa jmeter-2.0.1-r1.ebuild 1032
+EBUILD jmeter-2.0.1-r1.ebuild 1173 RMD160 29d3a687db8bd58c06ba1e959e449c2f5a92e98c SHA1 3b582fa695160100a7aaf80ca5e12d48a2b01339 SHA256 046a1ef904cac88462c6957393c7e8d0faacef4d71e80b2d4d8a4c98ed342cd7
+MD5 b1fa0d2d4f51c3b4334af00cbdf41ed8 jmeter-2.0.1-r1.ebuild 1173
+RMD160 29d3a687db8bd58c06ba1e959e449c2f5a92e98c jmeter-2.0.1-r1.ebuild 1173
+SHA256 046a1ef904cac88462c6957393c7e8d0faacef4d71e80b2d4d8a4c98ed342cd7 jmeter-2.0.1-r1.ebuild 1173
 EBUILD jmeter-2.0.1.ebuild 1175 RMD160 aac2726e05b69b64facec280c8c4e11dce7b83e8 SHA1 3f8c3256febd62d043bcca1ec4641393ec14a8d9 SHA256 1f4fa979e618898f26e429d23d7c7714333d7e53edebf8142240976a489b38d0
 MD5 298616ae4f32c0eef756ab0415c91980 jmeter-2.0.1.ebuild 1175
 RMD160 aac2726e05b69b64facec280c8c4e11dce7b83e8 jmeter-2.0.1.ebuild 1175
 SHA256 1f4fa979e618898f26e429d23d7c7714333d7e53edebf8142240976a489b38d0 jmeter-2.0.1.ebuild 1175
-MISC ChangeLog 4006 RMD160 38ff6827fc24c732a59233ee1709f4c17323e240 SHA1 bbfc86e583e60f5750cf4dba8ccfd10289c02b18 SHA256 40792db8b44fb625f4aac587bdbd0222b5df3a67adf2c9c93e6cbf2d21c3128c
-MD5 5ffd1f4138d751720a5c5459567c9486 ChangeLog 4006
-RMD160 38ff6827fc24c732a59233ee1709f4c17323e240 ChangeLog 4006
-SHA256 40792db8b44fb625f4aac587bdbd0222b5df3a67adf2c9c93e6cbf2d21c3128c ChangeLog 4006
+MISC ChangeLog 4128 RMD160 0393805dd08ac5e66941e033b33dd79f410c3c7f SHA1 54870ae54ffa5ff9c786ade901a3cd34fc3f0701 SHA256 2d0c3e93e1dab3aedee868e260b3641ec12da974c4e403aa27dfecb7ba730bfc
+MD5 3ab254b4a3f9396f562b891897344966 ChangeLog 4128
+RMD160 0393805dd08ac5e66941e033b33dd79f410c3c7f ChangeLog 4128
+SHA256 2d0c3e93e1dab3aedee868e260b3641ec12da974c4e403aa27dfecb7ba730bfc ChangeLog 4128
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -32,10 +29,3 @@ SHA256 4ca2c3d50ee02c62ead9ba68254fb328a93089481cd5e71f59fd0f9d1a7bfded files/di
 MD5 d1540ea6328f4c06a86366dc6f92bcc1 files/digest-jmeter-2.0.1-r1 268
 RMD160 b678931a5afa4f8f55253d9e4aa9817cd4c35c0a files/digest-jmeter-2.0.1-r1 268
 SHA256 4ca2c3d50ee02c62ead9ba68254fb328a93089481cd5e71f59fd0f9d1a7bfded files/digest-jmeter-2.0.1-r1 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEzNgmI1lqEGTUzyQRAiVSAJ4h0aVxK44brJnELt9HyDQeWgse3QCfdDr5
-8h6k++w4Otd1u9ybvkuBpz8=
-=ZUBW
------END PGP SIGNATURE-----
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild
index 452294ae858f..35c260230c36 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-2006 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.12 2006/07/22 22:23:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild,v 1.13 2006/08/05 21:42:43 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,7 +10,9 @@ SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
 DEPEND=">=virtual/jdk-1.3
 	dev-java/ant
 	doc? ( >=dev-java/velocity-1.4 )"
-RDEPEND=">=virtual/jre-1.3"
+RDEPEND=">=virtual/jre-1.3
+	dev-java/junit
+	dev-java/bsh"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -21,6 +23,10 @@ S=${WORKDIR}/jakarta-${P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
+	# FIXME replace all bundled jars bug #63309
+	# then rm -f *.jar
+	java-pkg_jar-from bsh
+	java-pkg_jar-from junit
 	use doc && java-pkg_jarfrom velocity
 }