From: William Thomson <wltjr@gentoo.org>
Date: Fri, 9 Feb 2007 19:38:05 +0000 (+0000)
Subject: Updated split ant deps
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f8e3b711359ca3efa8b526ee83a1fe14b16643e;p=gentoo.git

Updated split ant deps
Package-Manager: portage-2.1.2-r9
---

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/Manifest b/www-servers/tomcat/Manifest
index 63a2cb0fd827..5d0ec7c2fae5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -105,22 +105,22 @@ 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 10685 RMD160 a00c8e4a76e804267a0cee87acbf383eb4702272 SHA1 9f10c7a527056d5ce214df660f571dc2f09d756e SHA256 aa91e74ce95449259a62e4d8ccb69a34b2611d4078401a7f94c0bc1e41944761
-MD5 cc0d497a6e69a5d128dd7f4899aa7c28 tomcat-5.5.20-r10.ebuild 10685
-RMD160 a00c8e4a76e804267a0cee87acbf383eb4702272 tomcat-5.5.20-r10.ebuild 10685
-SHA256 aa91e74ce95449259a62e4d8ccb69a34b2611d4078401a7f94c0bc1e41944761 tomcat-5.5.20-r10.ebuild 10685
+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-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-6.0.9_beta.ebuild 5064 RMD160 f3357721d7790e34fe2a58bdc5628498ce7ed022 SHA1 e1901b9c13b6ad3e1001186f6a8bd7d71561163f SHA256 b07213fdc87e65f08ccae3fe1007b1ac871499dd7386c58477914c18a25020cd
-MD5 bf2a86d81d57646cd1436f7b25a39490 tomcat-6.0.9_beta.ebuild 5064
-RMD160 f3357721d7790e34fe2a58bdc5628498ce7ed022 tomcat-6.0.9_beta.ebuild 5064
-SHA256 b07213fdc87e65f08ccae3fe1007b1ac871499dd7386c58477914c18a25020cd tomcat-6.0.9_beta.ebuild 5064
-MISC ChangeLog 37901 RMD160 00d19ed1d22c3a3ae0a721db65c3524a19bd4d30 SHA1 577d5201859233f884a6469ab7f9a8f1195a9bdc SHA256 630d287872a43a16088871f41d80a370f1e4cd0c24c6c56e0ec63895948add29
-MD5 f8bff717484b8c477f714c7168460821 ChangeLog 37901
-RMD160 00d19ed1d22c3a3ae0a721db65c3524a19bd4d30 ChangeLog 37901
-SHA256 630d287872a43a16088871f41d80a370f1e4cd0c24c6c56e0ec63895948add29 ChangeLog 37901
+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 38038 RMD160 a9ede5b6aaab03c496c7169806821e38b4ba0bd7 SHA1 105ca86beded79f52189e0696f0195967f561237 SHA256 7ef3e3eb910d38baf60e900e84fd0a68084b5133b240fbc0b5b31969e83e815c
+MD5 47141aebb680c2249242c48c2151788e ChangeLog 38038
+RMD160 a9ede5b6aaab03c496c7169806821e38b4ba0bd7 ChangeLog 38038
+SHA256 7ef3e3eb910d38baf60e900e84fd0a68084b5133b240fbc0b5b31969e83e815c ChangeLog 38038
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
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(){