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.

Package-Manager: portage-2.1.2-r9

7 files changed, 63 insertions, 61 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/Manifest b/www-servers/tomcat/Manifest
index 318c47b90373..b19d7cbf71c5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -147,30 +147,30 @@ EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 e88ac9bae92fc262ad9b7c37ef6926299431
 MD5 2729d48603266ae1654d7f6823109afb tomcat-5.0.28-r14.ebuild 9331
 RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 tomcat-5.0.28-r14.ebuild 9331
 SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49 tomcat-5.0.28-r14.ebuild 9331
-EBUILD tomcat-5.5.20-r10.ebuild 10737 RMD160 f394e3c1eb2f9a35d53e20cc7b181a59a6edba71 SHA1 acc5eb2108738890731da7555a8d7f53cafabc33 SHA256 8d9b86c8a4b8dc6ffee6803e50d503f4af4f81f94e6af6c2ee0b067b1b8eeb21
-MD5 dfe38adf1535e2043dfe42a7d6dd0873 tomcat-5.5.20-r10.ebuild 10737
-RMD160 f394e3c1eb2f9a35d53e20cc7b181a59a6edba71 tomcat-5.5.20-r10.ebuild 10737
-SHA256 8d9b86c8a4b8dc6ffee6803e50d503f4af4f81f94e6af6c2ee0b067b1b8eeb21 tomcat-5.5.20-r10.ebuild 10737
+EBUILD tomcat-5.5.20-r10.ebuild 10693 RMD160 5ebabd35254ffdbf12eca539a660c4325b6258dd SHA1 d67b35f7feed5113aaf1a2906d03112bd4a39df5 SHA256 c120cf798dd4ca584182c1afb5b22fdf8359c39a267190b240b75a6b8c2d8296
+MD5 a326a773f05142e7f62cdd7061af232c tomcat-5.5.20-r10.ebuild 10693
+RMD160 5ebabd35254ffdbf12eca539a660c4325b6258dd tomcat-5.5.20-r10.ebuild 10693
+SHA256 c120cf798dd4ca584182c1afb5b22fdf8359c39a267190b240b75a6b8c2d8296 tomcat-5.5.20-r10.ebuild 10693
 EBUILD tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 SHA1 1c8830fbb27cea64307f2836eb476b0bb153757e SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035
 MD5 57d15320f6132d2222e2c9036c583f18 tomcat-5.5.20-r8.ebuild 10296
 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 tomcat-5.5.20-r8.ebuild 10296
 SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035 tomcat-5.5.20-r8.ebuild 10296
-EBUILD tomcat-5.5.22_pre.ebuild 10866 RMD160 ce36255045797989e7359c3a6d248e1db8dd2e60 SHA1 3d7e76c28f68a11d10dc702046ece7e5b039c6bd SHA256 23e4179e9d01e35d001320e76f8f1ce7f00066f8ae4c183e2bb48bab0c2da855
-MD5 f3efc8c806c832dc22cfd77098e6019d tomcat-5.5.22_pre.ebuild 10866
-RMD160 ce36255045797989e7359c3a6d248e1db8dd2e60 tomcat-5.5.22_pre.ebuild 10866
-SHA256 23e4179e9d01e35d001320e76f8f1ce7f00066f8ae4c183e2bb48bab0c2da855 tomcat-5.5.22_pre.ebuild 10866
-EBUILD tomcat-6.0.10_pre.ebuild 5122 RMD160 231026bc3afedae9578dba5875e8c4274ef70bf1 SHA1 88b35e435e4d7540865814451996bc5a1d116fb2 SHA256 02a83cd1b206c9a8b0b423ec43a3451aa84467298f6fe14f1014a9ea9a3635bb
-MD5 cde4aa7878a33eea073c039de67451c7 tomcat-6.0.10_pre.ebuild 5122
-RMD160 231026bc3afedae9578dba5875e8c4274ef70bf1 tomcat-6.0.10_pre.ebuild 5122
-SHA256 02a83cd1b206c9a8b0b423ec43a3451aa84467298f6fe14f1014a9ea9a3635bb tomcat-6.0.10_pre.ebuild 5122
-EBUILD tomcat-6.0.9_beta.ebuild 5050 RMD160 059a06d40d9e1a96ee8768c756a2a7d7990dfef7 SHA1 767c4d77f18f2c97c8f278b3cd65997833bbf159 SHA256 4bddf108bd1d8772598c1473e3a069bed339f2aa3c891ead9b182f44f48b3813
-MD5 b32c444a12871fe10eb20a26186da76e tomcat-6.0.9_beta.ebuild 5050
-RMD160 059a06d40d9e1a96ee8768c756a2a7d7990dfef7 tomcat-6.0.9_beta.ebuild 5050
-SHA256 4bddf108bd1d8772598c1473e3a069bed339f2aa3c891ead9b182f44f48b3813 tomcat-6.0.9_beta.ebuild 5050
-MISC ChangeLog 778 RMD160 923d4d872b9f5c7b8dfac5ff71a41b1f5557ee1d SHA1 bdcfa55c739d7045132d8648b92a14b2e5809f15 SHA256 ed9fdf83ce9a95b206c3bcf9cf42c44ed497414e9cbe01cc2faca48b3a8398f1
-MD5 293a1c27c2b8855591a716629c285dd4 ChangeLog 778
-RMD160 923d4d872b9f5c7b8dfac5ff71a41b1f5557ee1d ChangeLog 778
-SHA256 ed9fdf83ce9a95b206c3bcf9cf42c44ed497414e9cbe01cc2faca48b3a8398f1 ChangeLog 778
+EBUILD tomcat-5.5.22_pre-r1.ebuild 10825 RMD160 8e90c747485fb855a645c3277ac7d0432630a0e5 SHA1 15e3655e59f43ece0af68528e6992536a550ed40 SHA256 8af68af267a04a0f47d2e80cf84aaaca05d89b00656b7349c679044c820430aa
+MD5 486f7844d5e70ac19b65c600f5edc034 tomcat-5.5.22_pre-r1.ebuild 10825
+RMD160 8e90c747485fb855a645c3277ac7d0432630a0e5 tomcat-5.5.22_pre-r1.ebuild 10825
+SHA256 8af68af267a04a0f47d2e80cf84aaaca05d89b00656b7349c679044c820430aa tomcat-5.5.22_pre-r1.ebuild 10825
+EBUILD tomcat-6.0.10_pre.ebuild 5083 RMD160 e6aa0c1fe440de1214523ca7c7c00f4415c29043 SHA1 a3d555038ac5d551b23bb2d98e64d9cfd8958d23 SHA256 1a659b2ef2bdd7af54924b4b5c82efec59e2d3dea450026b087a8c91753039f0
+MD5 15f646ff747ecfc7489134ba7e5f53ba tomcat-6.0.10_pre.ebuild 5083
+RMD160 e6aa0c1fe440de1214523ca7c7c00f4415c29043 tomcat-6.0.10_pre.ebuild 5083
+SHA256 1a659b2ef2bdd7af54924b4b5c82efec59e2d3dea450026b087a8c91753039f0 tomcat-6.0.10_pre.ebuild 5083
+EBUILD tomcat-6.0.9_beta.ebuild 5011 RMD160 8d26faa0d5807413feb91c7c8de356a6a438462f SHA1 311b18dafba3ec10f54e9ba022755dfbd36e86a0 SHA256 443e7cb5b0c4daedf0e35280f6e240bc9a95bb45587408585d8918a9a0429787
+MD5 145ef69975816401b17b7f32369556d5 tomcat-6.0.9_beta.ebuild 5011
+RMD160 8d26faa0d5807413feb91c7c8de356a6a438462f tomcat-6.0.9_beta.ebuild 5011
+SHA256 443e7cb5b0c4daedf0e35280f6e240bc9a95bb45587408585d8918a9a0429787 tomcat-6.0.9_beta.ebuild 5011
+MISC ChangeLog 1173 RMD160 18b786016102fa4bd445edc0c172a03cae1e1037 SHA1 b13d43b5ee046bbbe6cfb050fb97d49ae9bce961 SHA256 8e1274305e83fc46f91ac34de9a29626827614fa6c90d2595cfa16eea5cf5a5e
+MD5 bcd9617664151a99f98153cb31231c80 ChangeLog 1173
+RMD160 18b786016102fa4bd445edc0c172a03cae1e1037 ChangeLog 1173
+SHA256 8e1274305e83fc46f91ac34de9a29626827614fa6c90d2595cfa16eea5cf5a5e ChangeLog 1173
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -184,9 +184,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
-MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-5.5.22_pre 277
-RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-5.5.22_pre 277
-SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-5.5.22_pre 277
+MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-5.5.22_pre-r1 277
+RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-5.5.22_pre-r1 277
+SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-5.5.22_pre-r1 277
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10_pre 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10_pre 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10_pre 277
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() {