diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-07-01 17:29:23 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-07-01 17:29:23 +0000 |
| commit | b5ce98c18b39503c5ebdde43ce83c05ebcb459dd (patch) | |
| tree | 4ffe9ac9923db3bdedb3e9964cc030b1b8e81408 /www-servers | |
| parent | Apply patch from upstream, reported by Debian, backported by Christoph Mende ... (diff) | |
| download | gentoo-2-b5ce98c18b39503c5ebdde43ce83c05ebcb459dd.tar.gz gentoo-2-b5ce98c18b39503c5ebdde43ce83c05ebcb459dd.tar.bz2 gentoo-2-b5ce98c18b39503c5ebdde43ce83c05ebcb459dd.zip | |
Switched to using automatic split-ant stuff via WANT_ANT_TASKS, related to last modification.
(Portage version: 2.1.2.9)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.23-r6.ebuild | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 677782b37aa1..105a14e213e0 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # 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.151 2007/07/01 17:07:07 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.152 2007/07/01 17:29:23 wltjr Exp $ + + 01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.23-r6.ebuild: + Switched to using automatic split-ant stuff via WANT_ANT_TASKS, related to + last modification. 01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org> 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 c28057de4160..80a528cb0d70 100644 --- a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild +++ b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild @@ -1,8 +1,8 @@ # 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.3 2007/07/01 17:07:07 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.4 2007/07/01 17:29:23 wltjr Exp $ -#WANT_ANT_TASKS="ant-trax" +WANT_ANT_TASKS="ant-trax" inherit eutils java-pkg-2 java-ant-2 @@ -48,8 +48,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.2* )" DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) - ${RDEPEND} - || ( dev-java/ant-trax dev-java/ant-tasks ) " + ${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -161,8 +160,7 @@ src_compile(){ antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" fi - # prevent classpath bloat with ant-1.7.0 which makes admin app fail - ANT_TASKS="ant-trax" eant ${antflags} + eant ${antflags} } src_install() { |