Corrected ant deps and tasks. Switched 5.5.20-r10 & 5.5.22_pre-r1 to ecj 3.2. Also correct their deps, too many were dropped when java5 USE flag is set.

(Portage version: 2.1.2-r9)

6 files changed, 40 insertions, 38 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index d348bf5f5d08..5ac36f1cada6 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,16 @@
 # 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.121 2007/02/13 22:39:09 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.122 2007/02/15 02:19:06 wltjr Exp $
+
+*tomcat-5.5.22_pre-r1 (15 Feb 2007)
+
+  15 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.20-r10.ebuild, -tomcat-5.5.22_pre.ebuild,
+  +tomcat-5.5.22_pre-r1.ebuild, tomcat-6.0.9_beta.ebuild,
+  tomcat-6.0.10_pre.ebuild:
+  Corrected ant deps and tasks. Switched 5.5.20-r10 & 5.5.22_pre-r1 to ecj
+  3.2. Also correct their deps, too many were dropped when java5 USE flag is
+  set.
 
 *tomcat-5.5.22_pre (13 Feb 2007)
 
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.22_pre b/www-servers/tomcat/files/digest-tomcat-5.5.22_pre-r1
index 9f11a897bf7a..9f11a897bf7a 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.22_pre
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.22_pre-r1
diff --git a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild b/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
index 562bdafccdb1..c8b698660e7a 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
@@ -1,6 +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.20-r10.ebuild,v 1.3 2007/02/09 19:38:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r10.ebuild,v 1.4 2007/02/15 02:19:06 wltjr Exp $
+
+WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -22,33 +24,31 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
 	>=dev-java/commons-dbcp-1.2.1
 	>=dev-java/commons-digester-1.7
 	>=dev-java/commons-fileupload-1.1
+	=dev-java/commons-httpclient-2.0*
 	>=dev-java/commons-io-1.1
 	>=dev-java/commons-el-1.0
 	>=dev-java/commons-launcher-0.9
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-modeler-1.1
 	>=dev-java/commons-pool-1.2
+	>=dev-java/junit-3.8.1
 	>=dev-java/log4j-1.2.9
-	=dev-java/tomcat-servlet-api-${PV}
+	>=dev-java/saxpath-1.0
+	~dev-java/tomcat-servlet-api-${PV}
 	admin? ( =dev-java/struts-1.2* )
 	dev-java/sun-javamail
 	java5? ( || ( >=virtual/jre-1.5 =virtual/jre-1.6 ) )
 	!java5? (
 		=virtual/jre-1.4*
-		=dev-java/commons-httpclient-2.0*
 		dev-java/sun-jaf
-		>=dev-java/junit-3.8.1
 		=dev-java/mx4j-core-3*
-		>=dev-java/saxpath-1.0
 		>=dev-java/xerces-2.7.1
 	   	=dev-java/xml-commons-external-1.3*
 	   )"
 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-core
-	dev-java/ant-trax"
+	>=dev-java/java-config-2.0.31"
 
 S=${WORKDIR}/${MY_P}
 
@@ -62,8 +62,6 @@ 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"
@@ -133,6 +131,7 @@ src_compile(){
 	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
 	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
 	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
+	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
 	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
@@ -143,6 +142,7 @@ src_compile(){
 	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
 	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
+	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar)"
 	if use admin; then
 		antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
@@ -158,10 +158,8 @@ src_compile(){
 	antflags="${antflags} -Djasper.home=${S}/jasper"
 	if ! use java5; then
 		antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
-		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
 		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)"
 		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j-rjmx.jar)"
-		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
 		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
 	fi
diff --git a/www-servers/tomcat/tomcat-5.5.22_pre.ebuild b/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild
index add7b6582931..2c8972a836a1 100644
--- a/www-servers/tomcat/tomcat-5.5.22_pre.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild
@@ -1,6 +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.22_pre.ebuild,v 1.1 2007/02/13 22:39:09 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild,v 1.1 2007/02/15 02:19:06 wltjr Exp $
+
+WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -17,40 +19,38 @@ LICENSE="Apache-2.0"
 
 IUSE="admin java5 doc examples source test"
 
-RDEPEND="=dev-java/eclipse-ecj-3.1*
+RDEPEND="=dev-java/eclipse-ecj-3.2*
 	=dev-java/commons-beanutils-1.7*
 	>=dev-java/commons-collections-3.1
 	>=dev-java/commons-daemon-1.0.1
 	>=dev-java/commons-dbcp-1.2.1
 	>=dev-java/commons-digester-1.7
 	>=dev-java/commons-fileupload-1.1
+	=dev-java/commons-httpclient-2.0*
 	>=dev-java/commons-io-1.1
 	>=dev-java/commons-el-1.0
 	>=dev-java/commons-launcher-0.9
 	>=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/log4j-1.2.9
+	>=dev-java/saxpath-1.0
 	~dev-java/tomcat-servlet-api-${PV}
 	admin? ( =dev-java/struts-1.2* )
 	dev-java/sun-javamail
 	java5? ( || ( >=virtual/jre-1.5 =virtual/jre-1.6 ) )
 	!java5? (
 		=virtual/jre-1.4*
-		=dev-java/commons-httpclient-2.0*
 		dev-java/sun-jaf
-		>=dev-java/junit-3.8.1
 		=dev-java/mx4j-core-3*
-		>=dev-java/saxpath-1.0
 		>=dev-java/xerces-2.7.1
 	   	=dev-java/xml-commons-external-1.3*
 	   )"
 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-core
-	dev-java/ant-trax"
+	>=dev-java/java-config-2.0.31"
 
 S=${WORKDIR}/${MY_P}
 
@@ -64,8 +64,6 @@ 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"
@@ -135,16 +133,18 @@ src_compile(){
 	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
 	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
 	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
+	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
 	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
 	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
 	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
+	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
 	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)"
 	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
 	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
+	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar)"
 	if use admin; then
 		antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
@@ -160,10 +160,8 @@ src_compile(){
 	antflags="${antflags} -Djasper.home=${S}/jasper"
 	if ! use java5; then
 		antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
-		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
 		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)"
 		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j-rjmx.jar)"
-		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
 		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
 	fi
diff --git a/www-servers/tomcat/tomcat-6.0.10_pre.ebuild b/www-servers/tomcat/tomcat-6.0.10_pre.ebuild
index aa9776b632c4..f3b557d2cbbf 100644
--- a/www-servers/tomcat/tomcat-6.0.10_pre.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.10_pre.ebuild
@@ -1,6 +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-6.0.10_pre.ebuild,v 1.1 2007/02/13 19:24:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10_pre.ebuild,v 1.2 2007/02/15 02:19:06 wltjr Exp $
+
+WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -26,9 +28,7 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
 
 DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	${RDEPEND}
-	test? ( dev-java/junit )
-	dev-java/ant-core
-	dev-java/ant-trax"
+	test? ( dev-java/junit )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -39,8 +39,6 @@ WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
 pkg_setup() {
 	enewgroup tomcat 265
 	enewuser tomcat 265 -1 /dev/null tomcat
-
-	WANT_ANT_TASKS="ant-trax"
 }
 
 src_unpack() {
diff --git a/www-servers/tomcat/tomcat-6.0.9_beta.ebuild b/www-servers/tomcat/tomcat-6.0.9_beta.ebuild
index 8dee04c126de..38b6142acf82 100644
--- a/www-servers/tomcat/tomcat-6.0.9_beta.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.9_beta.ebuild
@@ -1,6 +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-6.0.9_beta.ebuild,v 1.2 2007/02/09 19:38:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.9_beta.ebuild,v 1.3 2007/02/15 02:19:06 wltjr Exp $
+
+WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -25,9 +27,7 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
 
 DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	${RDEPEND}
-	test? ( dev-java/junit )
-	dev-java/ant-core
-	dev-java/ant-trax"
+	test? ( dev-java/junit )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -38,8 +38,6 @@ WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
 pkg_setup() {
 	enewgroup tomcat 265
 	enewuser tomcat 265 -1 /dev/null tomcat
-
-	WANT_ANT_TASKS="ant-trax"
 }
 
 src_unpack() {