diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.20-r10.ebuild | 7 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.9_beta.ebuild | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index df23ad631694..b89837de35cc 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.118 2007/02/08 15:21:51 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.119 2007/02/09 19:38:05 wltjr Exp $ + + 09 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.20-r10.ebuild, tomcat-6.0.9_beta.ebuild: + Updated split ant deps *tomcat-6.0.9_beta (08 Feb 2007) diff --git a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild b/www-servers/tomcat/tomcat-5.5.20-r10.ebuild index 55ebd4752bb7..562bdafccdb1 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r10.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.20-r10.ebuild,v 1.2 2007/02/04 01:41:46 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r10.ebuild,v 1.3 2007/02/09 19:38:05 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -47,7 +47,8 @@ DEPEND="java5? ( || ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ) !java5? ( =virtual/jdk-1.4* ) ${RDEPEND} >=dev-java/java-config-2.0.31 - dev-java/ant" + dev-java/ant-core + dev-java/ant-trax" S=${WORKDIR}/${MY_P} @@ -61,6 +62,8 @@ pkg_setup() { java-pkg_filter-compiler ecj-3.1 ecj-3.2 + WANT_ANT_TASKS="ant-trax" + if use java5; then JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" diff --git a/www-servers/tomcat/tomcat-6.0.9_beta.ebuild b/www-servers/tomcat/tomcat-6.0.9_beta.ebuild index b6410d0107d3..8dee04c126de 100644 --- a/www-servers/tomcat/tomcat-6.0.9_beta.ebuild +++ b/www-servers/tomcat/tomcat-6.0.9_beta.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-6.0.9_beta.ebuild,v 1.1 2007/02/08 15:21:51 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.9_beta.ebuild,v 1.2 2007/02/09 19:38:05 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -25,7 +25,9 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ${RDEPEND} - test? ( dev-java/junit )" + test? ( dev-java/junit ) + dev-java/ant-core + dev-java/ant-trax" S=${WORKDIR}/${MY_P} @@ -45,9 +47,6 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${SLOT}/build-xml.patch" - -# cd "${S}/bin" -# java-pkg_jar-from commons-daemon } src_compile(){ |