Make compatible with split-ant - was breaking with admin flag because there was a different servletapi slot on ant's classpath without specifying only the needed tasks. Older ant versions are not affected by this change.

Package-Manager: portage-2.1.2-r4

4 files changed, 25 insertions, 19 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6a594869f655..6a57f7246450 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.105 2007/01/20 16:54:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.106 2007/01/26 02:07:50 caster Exp $
+
+  26 Jan 2007; Vlastimil Babka <caster@gentoo.org> tomcat-5.5.20-r7.ebuild,
+  tomcat-5.5.20-r8.ebuild:
+  Make compatible with split-ant - was breaking with admin flag because there
+  was a different servletapi slot on ant's classpath without specifying only
+  the needed tasks. Older ant versions are not affected by this change.
 
 *tomcat-6.0.8_alpha (20 Jan 2007)
 *tomcat-6.0.7_beta-r3 (20 Jan 2007)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1d1c0210e112..1ac5705c8f07 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -119,14 +119,14 @@ EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f1
 MD5 1325b1a3c64afbb14284b913313073d9 tomcat-5.0.28-r14.ebuild 9331
 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f14d4e tomcat-5.0.28-r14.ebuild 9331
 SHA256 995765389ab7fda0cf3a628f6da919ca1e0c51b4cc7afd9aa371b094e45581d6 tomcat-5.0.28-r14.ebuild 9331
-EBUILD tomcat-5.5.20-r7.ebuild 10201 RMD160 7a78a19d602a7ba0c9ce9f5995a5ee9c5eb266bd SHA1 c262873810ee860f007b00b52224f5ca0d8783b9 SHA256 e30ed0f802c6884cbe475deae254c1424664f96cecdfca0e1425d4cf0c28e88e
-MD5 82b0faab83bc58a351dd78ae066b5da8 tomcat-5.5.20-r7.ebuild 10201
-RMD160 7a78a19d602a7ba0c9ce9f5995a5ee9c5eb266bd tomcat-5.5.20-r7.ebuild 10201
-SHA256 e30ed0f802c6884cbe475deae254c1424664f96cecdfca0e1425d4cf0c28e88e tomcat-5.5.20-r7.ebuild 10201
-EBUILD tomcat-5.5.20-r8.ebuild 10209 RMD160 38d895b3abae9b4861074c6655a27aed4e06eacc SHA1 dae15498fdefc12d1ace98e16999d5e7de2fd8a6 SHA256 74098fc2db7b9e1de575949802c067e52ac49d505fe17abcfe5354237615cc5e
-MD5 5593c59ecb32a67719db071947c37897 tomcat-5.5.20-r8.ebuild 10209
-RMD160 38d895b3abae9b4861074c6655a27aed4e06eacc tomcat-5.5.20-r8.ebuild 10209
-SHA256 74098fc2db7b9e1de575949802c067e52ac49d505fe17abcfe5354237615cc5e tomcat-5.5.20-r8.ebuild 10209
+EBUILD tomcat-5.5.20-r7.ebuild 10291 RMD160 aaf7a2b12c342ac1e392fda1a195321ae0e6750a SHA1 784828253df6bf9ab255508bd4b26459944305b0 SHA256 34f7363841d54cdf41c40427d371ca87ffada6641da38539fe50d512bff1b237
+MD5 282ae855ad7148064e6422ef941cc9b1 tomcat-5.5.20-r7.ebuild 10291
+RMD160 aaf7a2b12c342ac1e392fda1a195321ae0e6750a tomcat-5.5.20-r7.ebuild 10291
+SHA256 34f7363841d54cdf41c40427d371ca87ffada6641da38539fe50d512bff1b237 tomcat-5.5.20-r7.ebuild 10291
+EBUILD tomcat-5.5.20-r8.ebuild 10299 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e36aa SHA1 c6f3350e2b3b6b6eb68fcf774f566d4eae05f195 SHA256 9873ddf7870807f4bf6701a9f00ccc0202ae273c859a7c0c05a0e7c4c59a5601
+MD5 8af16e1d4381d7656ed93be48867ad03 tomcat-5.5.20-r8.ebuild 10299
+RMD160 dd99a6649a603e8262aeb33ae75a13466a3e36aa tomcat-5.5.20-r8.ebuild 10299
+SHA256 9873ddf7870807f4bf6701a9f00ccc0202ae273c859a7c0c05a0e7c4c59a5601 tomcat-5.5.20-r8.ebuild 10299
 EBUILD tomcat-6.0.7_beta-r3.ebuild 4594 RMD160 29f1ab1b903fdb92d438e5a9ca7f5e91cb96a14d SHA1 e143791d36924f90223be83d3b87ccea78be500c SHA256 b27596f4ba9ba08eedc8fbfcb8bfcfe8d77b7c52e51862fe5e59e8289266f09f
 MD5 b0ad9f67abd102331b3d62c29c6b14fc tomcat-6.0.7_beta-r3.ebuild 4594
 RMD160 29f1ab1b903fdb92d438e5a9ca7f5e91cb96a14d tomcat-6.0.7_beta-r3.ebuild 4594
@@ -135,10 +135,10 @@ EBUILD tomcat-6.0.8_alpha.ebuild 4593 RMD160 8a340dbcf686ab679ce753aa7aeb744c9c2
 MD5 a9440f368151c2aff2814547fb6d568d tomcat-6.0.8_alpha.ebuild 4593
 RMD160 8a340dbcf686ab679ce753aa7aeb744c9c27930e tomcat-6.0.8_alpha.ebuild 4593
 SHA256 9c24041b800061606ac979ad8ad82eb91a1daabf374dc80635cca7d4323d8dac tomcat-6.0.8_alpha.ebuild 4593
-MISC ChangeLog 33953 RMD160 e65b943129765e2b0b35199c64e4212354bb866f SHA1 22789dfd187bcc024b34c056135c8f69dd488826 SHA256 a0d854e0d24d469863b5722601a5004dc5c5ea6268a4debc85c53b11034ca543
-MD5 9d3cd9dbab72f3653d21ba74ce8d8c67 ChangeLog 33953
-RMD160 e65b943129765e2b0b35199c64e4212354bb866f ChangeLog 33953
-SHA256 a0d854e0d24d469863b5722601a5004dc5c5ea6268a4debc85c53b11034ca543 ChangeLog 33953
+MISC ChangeLog 34285 RMD160 5e87ae00f583315750bfadc1448546c8a8afb80c SHA1 861df834f5e97c8e89795ef3200f8f4769afdbd8 SHA256 44bd2a6cecb25689044a65de724f0c93129be0071165e4b8cd92a1457556cd16
+MD5 7b26445cfd873ab8fc276b325fdc320a ChangeLog 34285
+RMD160 5e87ae00f583315750bfadc1448546c8a8afb80c ChangeLog 34285
+SHA256 44bd2a6cecb25689044a65de724f0c93129be0071165e4b8cd92a1457556cd16 ChangeLog 34285
 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-r7.ebuild b/www-servers/tomcat/tomcat-5.5.20-r7.ebuild
index ed251b315946..616e5356f540 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r7.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r7.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-r7.ebuild,v 1.2 2007/01/10 21:06:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r7.ebuild,v 1.3 2007/01/26 02:07:51 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -163,8 +163,8 @@ src_compile(){
 		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
 	fi
 
-	eant ${antflags}
-
+	# prevent classpath bloat with ant-1.7.0 which makes admin app fail
+	ANT_TASKS="ant-trax" eant ${antflags}
 }
 
 src_install() {
diff --git a/www-servers/tomcat/tomcat-5.5.20-r8.ebuild b/www-servers/tomcat/tomcat-5.5.20-r8.ebuild
index 003cfd5585b3..8656bc6e57b8 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r8.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r8.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-r8.ebuild,v 1.1 2007/01/10 21:06:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r8.ebuild,v 1.2 2007/01/26 02:07:51 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -158,8 +158,8 @@ src_compile(){
 		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
 	fi
 
-	eant ${antflags}
-
+	# prevent classpath bloat with ant-1.7.0 which makes admin app fail
+	ANT_TASKS="ant-trax" eant ${antflags}
 }
 
 src_install() {