diff options
-rw-r--r-- | www-servers/tomcat/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-6.0.14-r1.ebuild | 6 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-6.0.14.ebuild | 6 |
3 files changed, 12 insertions, 8 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/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} |