Restrict junit dependency to proper slot.

Package-Manager: portage-2.1.4

4 files changed, 23 insertions, 19 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 64130cfe5d8d..286ab59cda4c 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.177 2008/01/21 13:28:57 caster Exp $
+
+  21 Jan 2008; Vlastimil Babka <caster@gentoo.org> tomcat-5.5.25.ebuild,
+  tomcat-5.5.25-r1.ebuild:
+  Restrict junit dependency to proper slot.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org> tomcat-6.0.14.ebuild,
   tomcat-6.0.14-r1.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d6f69bbc3fca..6db3eb42364f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -44,14 +44,14 @@ RMD160 391bafed1ff60c20f403c0983845b7da601447f1 files/6/webdav.patch 822
 SHA256 9ddac7c8eeac8b6892f9fd69c8c1d927bde47880e3470859da185599682cdc9c files/6/webdav.patch 822
 DIST apache-tomcat-5.5.25-src.tar.gz 5106363 RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d SHA1 81ef41e25f805831aa63353f52e5b498c74a3414 SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f
 DIST apache-tomcat-6.0.14-src.tar.gz 3458776 RMD160 24f586d946654edcc70c5ec1ee457022c4a5d070 SHA1 3156b0b853f8f340ef825c58d0281cdda3f5816e SHA256 ef57398cc8e0294fb74d0d76debdaebf51ec47f18c9c927ddc98530dfa93cf88
-EBUILD tomcat-5.5.25-r1.ebuild 10870 RMD160 63eae6d4cb09681c03492a8c446a3367416b7200 SHA1 ee6495211a7e6efe7e00a2aa19d8007de93a0955 SHA256 005719690ed19ae3648079e99d56348ad8b2d5b7101d90a52d891544c4363b1c
-MD5 0039779d185772d65cd0c4e6c19cbd21 tomcat-5.5.25-r1.ebuild 10870
-RMD160 63eae6d4cb09681c03492a8c446a3367416b7200 tomcat-5.5.25-r1.ebuild 10870
-SHA256 005719690ed19ae3648079e99d56348ad8b2d5b7101d90a52d891544c4363b1c tomcat-5.5.25-r1.ebuild 10870
-EBUILD tomcat-5.5.25.ebuild 10827 RMD160 1c4b739dfd0712b05b23f8ff23f3ea31609b96d2 SHA1 628e5b0d744395541bee39d32a113ea0acdf5e6a SHA256 577ef6a018953bc4855c596d5946c1169a635a0ad5e79401b917ea46908da113
-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-5.5.25-r1.ebuild 10867 RMD160 d581fa53dbdcc48e746c13a95aa5a607ed6e830a SHA1 7567d5696255718aa49be515b26b006b2fe0ad46 SHA256 f61338b1a3281ab4f988dd9f561de0b3feee0df122f0d38b834f8212d27248f9
+MD5 e87f55b52769f0b347681759ef26b406 tomcat-5.5.25-r1.ebuild 10867
+RMD160 d581fa53dbdcc48e746c13a95aa5a607ed6e830a tomcat-5.5.25-r1.ebuild 10867
+SHA256 f61338b1a3281ab4f988dd9f561de0b3feee0df122f0d38b834f8212d27248f9 tomcat-5.5.25-r1.ebuild 10867
+EBUILD tomcat-5.5.25.ebuild 10821 RMD160 794cc24a400931038e8231671bb51a1ae3b485a4 SHA1 1eda05953d562c7d78186d0f592fa6178b18b252 SHA256 e9cbfc3613e97573849b27220a6c2080f8c068deec27d1f092d1106f2aef3566
+MD5 0ffeeb26c7ab5864a04785a541bee49e tomcat-5.5.25.ebuild 10821
+RMD160 794cc24a400931038e8231671bb51a1ae3b485a4 tomcat-5.5.25.ebuild 10821
+SHA256 e9cbfc3613e97573849b27220a6c2080f8c068deec27d1f092d1106f2aef3566 tomcat-5.5.25.ebuild 10821
 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
@@ -60,10 +60,10 @@ EBUILD tomcat-6.0.14.ebuild 6240 RMD160 72934cf6951ae21b034506705ff5b5bb8148725b
 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 ChangeLog 51355 RMD160 c758f5d6295c11bc59608a9d3cb7602f36c7fdce SHA1 f209063432530abd3b448710736e89d83eb2b6df SHA256 217b6ea1e01439598deaf6ea364b9a59b9c12a563ae61a8c93e663c7ede630ab
+MD5 0c0d68ac0e7a980da476559b05acccad ChangeLog 51355
+RMD160 c758f5d6295c11bc59608a9d3cb7602f36c7fdce ChangeLog 51355
+SHA256 217b6ea1e01439598deaf6ea364b9a59b9c12a563ae61a8c93e663c7ede630ab ChangeLog 51355
 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-5.5.25-r1.ebuild b/www-servers/tomcat/tomcat-5.5.25-r1.ebuild
index 9952fb13c0f3..8177d8e8d482 100644
--- a/www-servers/tomcat/tomcat-5.5.25-r1.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.25-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-5.5.25-r1.ebuild,v 1.3 2007/10/17 06:21:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25-r1.ebuild,v 1.4 2008/01/21 13:28:57 caster Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -31,7 +31,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.3*
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-modeler-2.0
 	>=dev-java/commons-pool-1.2
-	>=dev-java/junit-3.8.1
+	=dev-java/junit-3*
 	>=dev-java/log4j-1.2.9
 	>=dev-java/saxpath-1.0
 	~dev-java/tomcat-servlet-api-${PV}
diff --git a/www-servers/tomcat/tomcat-5.5.25.ebuild b/www-servers/tomcat/tomcat-5.5.25.ebuild
index 90d588c1e683..e4f9a47005c8 100644
--- a/www-servers/tomcat/tomcat-5.5.25.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.25.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-5.5.25.ebuild,v 1.6 2007/10/12 11:38:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.7 2008/01/21 13:28:57 caster Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -31,7 +31,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.3*
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-modeler-2.0
 	>=dev-java/commons-pool-1.2
-	>=dev-java/junit-3.8.1
+	=dev-java/junit-3*
 	>=dev-java/log4j-1.2.9
 	>=dev-java/saxpath-1.0
 	~dev-java/tomcat-servlet-api-${PV}