summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-08-05 21:42:43 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-08-05 21:42:43 +0000
commit8ff80b3736c9eeaccee01a9e0569a5e2a609fb96 (patch)
tree914e4102f352dcbcea3f34a2dbfa165617025258 /app-benchmarks
parentStable on SPARC wrt bug #142570. (diff)
downloadgentoo-2-8ff80b3736c9eeaccee01a9e0569a5e2a609fb96.tar.gz
gentoo-2-8ff80b3736c9eeaccee01a9e0569a5e2a609fb96.tar.bz2
gentoo-2-8ff80b3736c9eeaccee01a9e0569a5e2a609fb96.zip
Fixed dependencies to account for java-strict.
(Portage version: 2.1.1_pre4-r2)
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/jmeter/ChangeLog5
-rw-r--r--app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild10
2 files changed, 12 insertions, 3 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/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
}