summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-12-14 16:26:48 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-12-14 16:26:48 +0000
commite470edd112df8810b871deea9e3b2957a5d97e90 (patch)
treeb8af9608fc0938938b9a6f0b3dca7ace9c175db1 /app-benchmarks/jmeter
parentStable on amd64. (Manifest recommit) (diff)
downloadgentoo-2-e470edd112df8810b871deea9e3b2957a5d97e90.tar.gz
gentoo-2-e470edd112df8810b871deea9e3b2957a5d97e90.tar.bz2
gentoo-2-e470edd112df8810b871deea9e3b2957a5d97e90.zip
fix deps 74389
Diffstat (limited to 'app-benchmarks/jmeter')
-rw-r--r--app-benchmarks/jmeter/ChangeLog6
-rw-r--r--app-benchmarks/jmeter/jmeter-1.9.1.ebuild7
-rw-r--r--app-benchmarks/jmeter/jmeter-2.0.1.ebuild3
3 files changed, 11 insertions, 5 deletions
diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index c7ace5fcb8be..97ababc6a520 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,10 @@
# 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.14 2004/10/16 18:13:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.15 2004/12/14 16:26:48 axxo Exp $
+
+ 14 Dec 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+ jmeter-2.0.1.ebuild:
+ fix deps 74389
16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
jmeter-2.0.1-r1.ebuild, jmeter-2.0.1.ebuild:
diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index e25d71197cd7..c6f5986e9475 100644
--- a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.9.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/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.5 2004/10/16 18:13:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.6 2004/12/14 16:26:48 axxo Exp $
inherit java-pkg
@@ -8,6 +8,7 @@ DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databas
HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}.src.tgz"
DEPEND=">=virtual/jdk-1.3
+ dev-java/ant
jikes? ( dev-java/jikes )"
RDEPEND=">=virtual/jdk-1.3"
LICENSE="Apache-1.1"
@@ -21,14 +22,14 @@ src_compile () {
local antflags="package"
use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
use doc && antflags="${antflags} alldocs"
- ant ${antflags}
+ ant ${antflags} || die "build failed"
}
src_install () {
# Can't think of a better way to deal with this for now...
DIROPTIONS="--mode=0775"
dodir /opt/${PN}
- cp -ar bin/ lib/ ${D}/opt/${PN}/
+ cp -ar bin/ lib/ ${D}/opt/${PN}/ || die "failed to install"
dodoc README
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 baa7fbaf8880..01fbd3181e3e 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-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/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.3 2004/10/16 18:13:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.4 2004/12/14 16:26:48 axxo Exp $
inherit java-pkg
@@ -8,6 +8,7 @@ DESCRIPTION="Load test and measure performance on HTTP/FTP services and database
HOMEPAGE="http://jakarta.apache.org/jmeter"
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 )"
# jikes ( dev-java/jikes"
RDEPEND=">=virtual/jdk-1.3"