summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-01-10 21:58:30 +0000
committerVlastimil Babka <caster@gentoo.org>2008-01-10 21:58:30 +0000
commitf898772ddd7466f2e020b8f7b01f498f738a6914 (patch)
tree4ec7a55adcb70417074c5dd8d8d1706b3abfb5e3 /app-benchmarks
parentfix tests (see bug #205148) (diff)
downloadgentoo-2-f898772ddd7466f2e020b8f7b01f498f738a6914.tar.gz
gentoo-2-f898772ddd7466f2e020b8f7b01f498f738a6914.tar.bz2
gentoo-2-f898772ddd7466f2e020b8f7b01f498f738a6914.zip
Restrict junit dependency.
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/jmeter/ChangeLog8
-rw-r--r--app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild6
-rw-r--r--app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild6
3 files changed, 12 insertions, 8 deletions
diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index ffcbdff2b4bf..3a318baa7a88 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-benchmarks/jmeter
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.31 2007/11/20 05:21:29 ali_bush Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.32 2008/01/10 21:58:30 caster Exp $
+
+ 10 Jan 2008; Vlastimil Babka <caster@gentoo.org> jmeter-2.0.1-r2.ebuild,
+ jmeter-2.0.1-r3.ebuild:
+ Restrict junit dependency.
*jmeter-2.0.1-r3 (20 Nov 2007)
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild
index 1bf26a21b8c1..d6add44c675b 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r2.ebuild,v 1.2 2007/08/14 08:39:00 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild,v 1.3 2008/01/10 21:58:30 caster Exp $
inherit java-pkg-2 java-ant-2
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
COMMON_DEP="
beanshell? ( dev-java/bsh )
>=dev-java/bsf-2.3
- dev-java/junit
+ =dev-java/junit-3.8*
dev-java/sun-javamail"
DEPEND=">=virtual/jdk-1.4
doc? ( >=dev-java/velocity-1.4 )
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild
index 6d0f9620189d..713ba06a4784 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2007/11/20 05:21:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild,v 1.2 2008/01/10 21:58:30 caster Exp $
inherit java-pkg-2 java-ant-2
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
COMMON_DEP="
beanshell? ( dev-java/bsh )
>=dev-java/bsf-2.3
- dev-java/junit
+ =dev-java/junit-3.8*
java-virtuals/javamail"
DEPEND=">=virtual/jdk-1.4
doc? ( >=dev-java/velocity-1.4 )