Restrict junit dependency.

Package-Manager: portage-2.1.4_rc14

4 files changed, 24 insertions, 20 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/Manifest b/app-benchmarks/jmeter/Manifest
index 7cabc2d6ec68..094f477d027f 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,16 +1,16 @@
 DIST jakarta-jmeter-2.0.1_src.tgz 5368483 RMD160 ec4db77dfd2205115e8206548da34db80dec24ea SHA1 69242001ab710b6a255bda72cfef329131f1cb3f SHA256 8dc7b0ff680af721adeeab198f7dc99f5e376df04c2504291564cfaccdcf5f36
-EBUILD jmeter-2.0.1-r2.ebuild 1512 RMD160 363ddea0b297094f1b6d1d570c306fa595ebbd78 SHA1 67ac09f946ccf622198a9cb0b1828d2a11800664 SHA256 374fad167c7556a364d55ce6727d500bab993fd8a4dad8f9d35039ee057b5751
-MD5 6df224514ee5dfb12889e333c5d0b080 jmeter-2.0.1-r2.ebuild 1512
-RMD160 363ddea0b297094f1b6d1d570c306fa595ebbd78 jmeter-2.0.1-r2.ebuild 1512
-SHA256 374fad167c7556a364d55ce6727d500bab993fd8a4dad8f9d35039ee057b5751 jmeter-2.0.1-r2.ebuild 1512
-EBUILD jmeter-2.0.1-r3.ebuild 1514 RMD160 d7f40a9726dd6deae63dc9fe2db8f3f0d3c11adb SHA1 f2178689859f36cd306a9ecb314a3273a9ce1a09 SHA256 c8840c65739e3cb8313c31d41cf0be968bc77c13424569231c5b83a453574ca3
-MD5 35c42235d879149fc49e23a6a1d1476e jmeter-2.0.1-r3.ebuild 1514
-RMD160 d7f40a9726dd6deae63dc9fe2db8f3f0d3c11adb jmeter-2.0.1-r3.ebuild 1514
-SHA256 c8840c65739e3cb8313c31d41cf0be968bc77c13424569231c5b83a453574ca3 jmeter-2.0.1-r3.ebuild 1514
-MISC ChangeLog 4859 RMD160 61e2b5fd20ee9cfa4b42760f985119b20b63f31f SHA1 fa3e65687854ba176be9e1cac7d6e38f38d3056d SHA256 3d4da1349ca0bc78b0c63968327e38fe1eb6f69a956bbdb9103b50c526be33cb
-MD5 6694159026de26fb0ce06c1b984ea875 ChangeLog 4859
-RMD160 61e2b5fd20ee9cfa4b42760f985119b20b63f31f ChangeLog 4859
-SHA256 3d4da1349ca0bc78b0c63968327e38fe1eb6f69a956bbdb9103b50c526be33cb ChangeLog 4859
+EBUILD jmeter-2.0.1-r2.ebuild 1519 RMD160 a5ff40465b210a4d6d770c46ec0e7115d81f6b35 SHA1 5b820486bc42d8a4f1a6ffe778e9b33c190fc3cd SHA256 f07d9ea72386628aff3719025f71db491eeb4d17e3a16d788643c0663e7ccb03
+MD5 b0b14925751e8696c5fe9e5be2b6df21 jmeter-2.0.1-r2.ebuild 1519
+RMD160 a5ff40465b210a4d6d770c46ec0e7115d81f6b35 jmeter-2.0.1-r2.ebuild 1519
+SHA256 f07d9ea72386628aff3719025f71db491eeb4d17e3a16d788643c0663e7ccb03 jmeter-2.0.1-r2.ebuild 1519
+EBUILD jmeter-2.0.1-r3.ebuild 1518 RMD160 092363703733e41c5df55d7ac06e03495fb923cb SHA1 039e7cdddd9e5f0b06d15dbb537db1f56907ab45 SHA256 97a9aa72ff5afda0508222f3af79059ee31dab704c37133e49bf5c0426caf808
+MD5 004d266a14feb139b530463e548bfbed jmeter-2.0.1-r3.ebuild 1518
+RMD160 092363703733e41c5df55d7ac06e03495fb923cb jmeter-2.0.1-r3.ebuild 1518
+SHA256 97a9aa72ff5afda0508222f3af79059ee31dab704c37133e49bf5c0426caf808 jmeter-2.0.1-r3.ebuild 1518
+MISC ChangeLog 4988 RMD160 3f8177655a72308958a983ca5ab16ee045da5cc0 SHA1 153628526ff68c323cbee4ce7dc235ebad6ce96c SHA256 1d0bba59a3a33a835be2c3710a3ddb2cf7e8527ea437193b3f401bedea6461cf
+MD5 80c5e82dbe5f993fd8814a5716e988c0 ChangeLog 4988
+RMD160 3f8177655a72308958a983ca5ab16ee045da5cc0 ChangeLog 4988
+SHA256 1d0bba59a3a33a835be2c3710a3ddb2cf7e8527ea437193b3f401bedea6461cf ChangeLog 4988
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
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 )