diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-07-01 17:07:07 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-07-01 17:07:07 +0000 |
| commit | 1792f230ee538d51904c0ca9f32031a4e2ed0402 (patch) | |
| tree | c5f9507cafb4e9779b607ee7d9301bb46b1342af /www-servers/tomcat | |
| parent | Stable on mips, per #174882. (diff) | |
| download | gentoo-2-1792f230ee538d51904c0ca9f32031a4e2ed0402.tar.gz gentoo-2-1792f230ee538d51904c0ca9f32031a4e2ed0402.tar.bz2 gentoo-2-1792f230ee538d51904c0ca9f32031a4e2ed0402.zip | |
Added ant-trax to dep fix for bug #183849
(Portage version: 2.1.2.9)
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.23-r6.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index e9155b8d6c0d..677782b37aa1 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.150 2007/06/17 15:53:56 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.151 2007/07/01 17:07:07 wltjr Exp $ + + 01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.23-r6.ebuild: + Added ant-trax to dep fix for bug #183849 17 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org> tomcat-5.5.23-r1.ebuild, tomcat-5.5.23-r6.ebuild, diff --git a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild index f1ae8b34c38c..c28057de4160 100644 --- a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild +++ b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.2 2007/06/17 15:53:56 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.3 2007/07/01 17:07:07 wltjr Exp $ #WANT_ANT_TASKS="ant-trax" @@ -48,7 +48,8 @@ RDEPEND="=dev-java/eclipse-ecj-3.2* )" DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) - ${RDEPEND}" + ${RDEPEND} + || ( dev-java/ant-trax dev-java/ant-tasks ) " S=${WORKDIR}/${MY_P} |