summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-servers/tomcat/ChangeLog6
-rw-r--r--www-servers/tomcat/Manifest16
-rw-r--r--www-servers/tomcat/tomcat-5.5.20-r2.ebuild4
3 files changed, 15 insertions, 11 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 1a926ada0914..4ab5f110c264 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.73 2006/10/18 03:21:19 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.74 2006/10/18 13:34:42 wltjr Exp $
+
+ 18 Oct 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+ tomcat-5.5.20-r2.ebuild:
+ Fixed problem with ant calling targets that don't exist, like javadoc.
*tomcat-5.5.20-r2 (18 Oct 2006)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 39e98181e8f7..2c887a9093d1 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -158,18 +158,18 @@ EBUILD tomcat-5.5.20-r1.ebuild 10160 RMD160 6bb48ece42420fcb236e1996b6756365bdb2
MD5 b274087a9eeb3bb8b2cce756acfca69e tomcat-5.5.20-r1.ebuild 10160
RMD160 6bb48ece42420fcb236e1996b6756365bdb21b5c tomcat-5.5.20-r1.ebuild 10160
SHA256 9fdafe2f1873958ede8e308256649ab8cbef92159920a2a401e74f321afc75f1 tomcat-5.5.20-r1.ebuild 10160
-EBUILD tomcat-5.5.20-r2.ebuild 10264 RMD160 6a7b4a9b495dc71e7d216fb54af6fa7204574703 SHA1 4443cff06390da192908737e3b953238fee8e05f SHA256 1bbeb2ea99353f0a6bd7818941357aaeebabbb0babcc9c50039c99415fd172d7
-MD5 195baad02512fb034063e9bc54cea23c tomcat-5.5.20-r2.ebuild 10264
-RMD160 6a7b4a9b495dc71e7d216fb54af6fa7204574703 tomcat-5.5.20-r2.ebuild 10264
-SHA256 1bbeb2ea99353f0a6bd7818941357aaeebabbb0babcc9c50039c99415fd172d7 tomcat-5.5.20-r2.ebuild 10264
+EBUILD tomcat-5.5.20-r2.ebuild 10236 RMD160 803b546e349b196a101ea05d1270898f87df456b SHA1 3bf344200fda3db95ef798dd34b23e1adc667c44 SHA256 aae9bb56031ac2565d156de599e5c6e58076cb3ae7cd1d9672a9c478442c8961
+MD5 3ff07bfaf99e2a9666c74c9de87895ae tomcat-5.5.20-r2.ebuild 10236
+RMD160 803b546e349b196a101ea05d1270898f87df456b tomcat-5.5.20-r2.ebuild 10236
+SHA256 aae9bb56031ac2565d156de599e5c6e58076cb3ae7cd1d9672a9c478442c8961 tomcat-5.5.20-r2.ebuild 10236
EBUILD tomcat-5.5.20.ebuild 10159 RMD160 ccb63bc3de9f6885378d0b460f54e900f36ba65e SHA1 5e42b03c4d37167c6baa0131908c220fc3ef5f2f SHA256 226a19b4d1357ef1e94afaac92cee0b551459357ff4513169b18940ea93ff760
MD5 ece22bdbe2b716ccc17046c2babd6e66 tomcat-5.5.20.ebuild 10159
RMD160 ccb63bc3de9f6885378d0b460f54e900f36ba65e tomcat-5.5.20.ebuild 10159
SHA256 226a19b4d1357ef1e94afaac92cee0b551459357ff4513169b18940ea93ff760 tomcat-5.5.20.ebuild 10159
-MISC ChangeLog 25777 RMD160 404e022be71c734cbd15ab67d5f2a4258ef025a6 SHA1 9a8931bb3adb0df1a27d9fb177a89d2f7aa8ea96 SHA256 64aaab03d24787f25dddf2fd5f3b42ecedab7f04c9bfacb8bb40d0312cc4ac66
-MD5 68ba8a1b12cd29fdfa8f2c68cf2bd2bd ChangeLog 25777
-RMD160 404e022be71c734cbd15ab67d5f2a4258ef025a6 ChangeLog 25777
-SHA256 64aaab03d24787f25dddf2fd5f3b42ecedab7f04c9bfacb8bb40d0312cc4ac66 ChangeLog 25777
+MISC ChangeLog 25935 RMD160 9415bc6e4cf8fda110dba18dcd11eebce1c9c386 SHA1 dc83099ef3c6a1bb824bdd09b5b55e02739916ff SHA256 7d9c178555fa29ca5b547c27720dc0f57eb0bd3156e93a4d13c7cfa0e3e459f7
+MD5 aafe5b800221352458f0a7688ac8d3e7 ChangeLog 25935
+RMD160 9415bc6e4cf8fda110dba18dcd11eebce1c9c386 ChangeLog 25935
+SHA256 7d9c178555fa29ca5b547c27720dc0f57eb0bd3156e93a4d13c7cfa0e3e459f7 ChangeLog 25935
MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
diff --git a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild b/www-servers/tomcat/tomcat-5.5.20-r2.ebuild
index c30a7e036f73..8a70bc6fabeb 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/10/18 03:21:19 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r2.ebuild,v 1.2 2006/10/18 13:34:42 wltjr Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -124,7 +124,7 @@ src_unpack() {
}
src_compile(){
- local antflags="-Dbase.path=${T} $(use_doc javadoc examples)"
+ local antflags="-Dbase.path=${T}"
antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"