Restrict junit dependency.

Package-Manager: portage-2.1.4_rc14

4 files changed, 24 insertions, 20 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0f7d70c77ba1..64130cfe5d8d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.175 2007/10/18 17:02:56 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.176 2008/01/10 23:08:12 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org> tomcat-6.0.14.ebuild,
+  tomcat-6.0.14-r1.ebuild:
+  Restrict junit dependency.
 
   18 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   tomcat-6.0.14-r1.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 97edb3c4c95e..d6f69bbc3fca 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -52,18 +52,18 @@ EBUILD tomcat-5.5.25.ebuild 10827 RMD160 1c4b739dfd0712b05b23f8ff23f3ea31609b96d
 MD5 1e66a7a8c00f1c8a4294d26611aa887c tomcat-5.5.25.ebuild 10827
 RMD160 1c4b739dfd0712b05b23f8ff23f3ea31609b96d2 tomcat-5.5.25.ebuild 10827
 SHA256 577ef6a018953bc4855c596d5946c1169a635a0ad5e79401b917ea46908da113 tomcat-5.5.25.ebuild 10827
-EBUILD tomcat-6.0.14-r1.ebuild 6284 RMD160 f96dba9a3b2491962b418b940ec11c56b4e1c2b9 SHA1 73b5e097782dfd09ae93bfb2c5bf5e7aa66b9171 SHA256 6bf601c0e34a6a8ef9ab2a4c802c5671a4cb72827601c352d254cefa609a43e7
-MD5 0f3dc3c6ab67276f426836cc21ed6b3e tomcat-6.0.14-r1.ebuild 6284
-RMD160 f96dba9a3b2491962b418b940ec11c56b4e1c2b9 tomcat-6.0.14-r1.ebuild 6284
-SHA256 6bf601c0e34a6a8ef9ab2a4c802c5671a4cb72827601c352d254cefa609a43e7 tomcat-6.0.14-r1.ebuild 6284
-EBUILD tomcat-6.0.14.ebuild 6233 RMD160 8af3337ef007e7443ee2a85f30984089abe1c1bd SHA1 c876c3046893fb1435bf83c9b3702fb44de8bff3 SHA256 d41e39fdb0dd8a792b3898cbd4f6acf29fc2671c5e06604f2258d851ba78fad5
-MD5 a0450216f073219fb7ba24fe15026b98 tomcat-6.0.14.ebuild 6233
-RMD160 8af3337ef007e7443ee2a85f30984089abe1c1bd tomcat-6.0.14.ebuild 6233
-SHA256 d41e39fdb0dd8a792b3898cbd4f6acf29fc2671c5e06604f2258d851ba78fad5 tomcat-6.0.14.ebuild 6233
-MISC ChangeLog 51084 RMD160 317f3492156d16c230737374ae62be60312e9b9c SHA1 5a78cbd1bd1b133ed91e988c405a08ed03f46f7d SHA256 9c9b4e47239fee1cdf9c7727de0ae09fe275523e5cde3a3c7c013f3e793decd2
-MD5 d172628697a368fb41360779e7c763d5 ChangeLog 51084
-RMD160 317f3492156d16c230737374ae62be60312e9b9c ChangeLog 51084
-SHA256 9c9b4e47239fee1cdf9c7727de0ae09fe275523e5cde3a3c7c013f3e793decd2 ChangeLog 51084
+EBUILD tomcat-6.0.14-r1.ebuild 6286 RMD160 024b3fa2b315b61ac26e7edc0209a6d49296cb93 SHA1 58d0180b5cf01c5f1487c9bf1da5e18ee950c0d9 SHA256 5a096f5ab7504f8f004fc3cb71be282e64a4b680447812fab9bbdb986c6c697d
+MD5 eb6d2884a08cb075490a034a8934dadc tomcat-6.0.14-r1.ebuild 6286
+RMD160 024b3fa2b315b61ac26e7edc0209a6d49296cb93 tomcat-6.0.14-r1.ebuild 6286
+SHA256 5a096f5ab7504f8f004fc3cb71be282e64a4b680447812fab9bbdb986c6c697d tomcat-6.0.14-r1.ebuild 6286
+EBUILD tomcat-6.0.14.ebuild 6240 RMD160 72934cf6951ae21b034506705ff5b5bb8148725b SHA1 aae418d32043873e694fa19d0a3c915771608b1a SHA256 621fb73876cdfdec865251467c26b15320e646e38d67ce9d5b31d5063c4be7b7
+MD5 891ec7529b2fce152d81e950a1221afb tomcat-6.0.14.ebuild 6240
+RMD160 72934cf6951ae21b034506705ff5b5bb8148725b tomcat-6.0.14.ebuild 6240
+SHA256 621fb73876cdfdec865251467c26b15320e646e38d67ce9d5b31d5063c4be7b7 tomcat-6.0.14.ebuild 6240
+MISC ChangeLog 51210 RMD160 204a9317750862c90fa679bf0990f9e1aa85ade4 SHA1 7254910d9c2f287555b2c1bc7302310527fa4ea6 SHA256 e110ffee33ccb5e09dcef0db81bdb42b9c6d501c7f4eca3b90fc8204b885c939
+MD5 b1609b9a1e5302822634d9a05b0a6438 ChangeLog 51210
+RMD160 204a9317750862c90fa679bf0990f9e1aa85ade4 ChangeLog 51210
+SHA256 e110ffee33ccb5e09dcef0db81bdb42b9c6d501c7f4eca3b90fc8204b885c939 ChangeLog 51210
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
diff --git a/www-servers/tomcat/tomcat-6.0.14-r1.ebuild b/www-servers/tomcat/tomcat-6.0.14-r1.ebuild
index 547b54566288..8bb8c46f2476 100644
--- a/www-servers/tomcat/tomcat-6.0.14-r1.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.14-r1.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/www-servers/tomcat/tomcat-6.0.14-r1.ebuild,v 1.5 2007/10/18 17:02:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.14-r1.ebuild,v 1.6 2008/01/10 23:08:12 caster Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -31,7 +31,7 @@ RDEPEND=">=virtual/jre-1.5
 
 DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEPEND}
-	test? ( dev-java/junit )"
+	test? ( =dev-java/junit-3.8* )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/www-servers/tomcat/tomcat-6.0.14.ebuild b/www-servers/tomcat/tomcat-6.0.14.ebuild
index 666bc0076cb5..cb252459fd25 100644
--- a/www-servers/tomcat/tomcat-6.0.14.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.14.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/www-servers/tomcat/tomcat-6.0.14.ebuild,v 1.6 2007/10/12 02:47:16 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.14.ebuild,v 1.7 2008/01/10 23:08:12 caster Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -31,7 +31,7 @@ RDEPEND=">=virtual/jre-1.5
 
 DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEPEND}
-	test? ( dev-java/junit )"
+	test? ( =dev-java/junit-3.8* )"
 
 S=${WORKDIR}/${MY_P}