diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-07-01 17:29:23 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-07-01 17:29:23 +0000 |
| commit | 7d31e6face5be8de9908293559261b38f7866fbe (patch) | |
| tree | 28eb41ef254862999136f69ed15c1ba4290f390c /www-servers | |
| parent | Apply patch from upstream, reported by Debian, backported by Christoph Mende ... (diff) | |
| download | historical-7d31e6face5be8de9908293559261b38f7866fbe.tar.gz historical-7d31e6face5be8de9908293559261b38f7866fbe.tar.bz2 historical-7d31e6face5be8de9908293559261b38f7866fbe.zip | |
Switched to using automatic split-ant stuff via WANT_ANT_TASKS, related to last modification.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 16 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.23-r6.ebuild | 10 |
3 files changed, 18 insertions, 15 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 677782b37aa1..105a14e213e0 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # 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.151 2007/07/01 17:07:07 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.152 2007/07/01 17:29:23 wltjr Exp $ + + 01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.23-r6.ebuild: + Switched to using automatic split-ant stuff via WANT_ANT_TASKS, related to + last modification. 01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org> tomcat-5.5.23-r6.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 6c30e4a42cf1..9989ce2c4729 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -64,18 +64,18 @@ EBUILD tomcat-5.5.23-r1.ebuild 10930 RMD160 3eccd694f37bebd9b8f827a3446eb59df1a2 MD5 9b53dd2cac285f9e9682b90a0e920b53 tomcat-5.5.23-r1.ebuild 10930 RMD160 3eccd694f37bebd9b8f827a3446eb59df1a2889e tomcat-5.5.23-r1.ebuild 10930 SHA256 b9f02c81150d88932f35db49158fbdd1fcf13de8cc0336ed33b75cf2a22748f1 tomcat-5.5.23-r1.ebuild 10930 -EBUILD tomcat-5.5.23-r6.ebuild 11251 RMD160 719ac317403fc73aeb1a850ec6da9b490734a9cf SHA1 f2feb28aa1256e661c8e6d8763c9af9a7e91ca17 SHA256 dffe68a98938c183df6748125fb40bb1885aa39fa86f413bbf451e2c83d27c26 -MD5 05f0bbb3f53047f3fe22e6001741ad29 tomcat-5.5.23-r6.ebuild 11251 -RMD160 719ac317403fc73aeb1a850ec6da9b490734a9cf tomcat-5.5.23-r6.ebuild 11251 -SHA256 dffe68a98938c183df6748125fb40bb1885aa39fa86f413bbf451e2c83d27c26 tomcat-5.5.23-r6.ebuild 11251 +EBUILD tomcat-5.5.23-r6.ebuild 11114 RMD160 5e07e0947270d173d6ac6def84c6c6ae923cd50a SHA1 2dd3f4eadd0089af0bf6c8dd01b0c75bb008ce81 SHA256 14824f11d589f5cb21e4c2d75bde05ed043cd8d79acaea206f4073ac52b5393d +MD5 e22c514f4ac95c2760449e3f5eb1f27c tomcat-5.5.23-r6.ebuild 11114 +RMD160 5e07e0947270d173d6ac6def84c6c6ae923cd50a tomcat-5.5.23-r6.ebuild 11114 +SHA256 14824f11d589f5cb21e4c2d75bde05ed043cd8d79acaea206f4073ac52b5393d tomcat-5.5.23-r6.ebuild 11114 EBUILD tomcat-6.0.13-r3.ebuild 6214 RMD160 8cfb412e68750b6c608b38a008b3f7e997fd2ab3 SHA1 f62103a7319cdcb63c5b41d11a4f4362177cee59 SHA256 a3aec0f7eca5c0caefe72eecad8df50ec8fe50ab922f180f9835c9765685e64a MD5 585c348fcc49dd62185e7d73db418756 tomcat-6.0.13-r3.ebuild 6214 RMD160 8cfb412e68750b6c608b38a008b3f7e997fd2ab3 tomcat-6.0.13-r3.ebuild 6214 SHA256 a3aec0f7eca5c0caefe72eecad8df50ec8fe50ab922f180f9835c9765685e64a tomcat-6.0.13-r3.ebuild 6214 -MISC ChangeLog 47355 RMD160 e1f9fe35e689fac3d5d08f17d79fdac6532f7c6e SHA1 b499f42cbddaf2bbbb3a92ebbb4f970f9d6ba5fc SHA256 07addb34a800588172848d94201339bbb6338d89cff209f67a8a0094a39b1108 -MD5 7a752a8109c465bbb67dac7636966b90 ChangeLog 47355 -RMD160 e1f9fe35e689fac3d5d08f17d79fdac6532f7c6e ChangeLog 47355 -SHA256 07addb34a800588172848d94201339bbb6338d89cff209f67a8a0094a39b1108 ChangeLog 47355 +MISC ChangeLog 47538 RMD160 68509717d65029d032ac8e1172b4b4ba033a1bb9 SHA1 8c6637595c55e2f18bcace7dbd15204dca8be4a8 SHA256 297678904e5206f7d5ff2f95c84e23f7560a893e63118190ead0e58225575036 +MD5 e93e8dcdc9f8ebe64a2a42e07803bfe8 ChangeLog 47538 +RMD160 68509717d65029d032ac8e1172b4b4ba033a1bb9 ChangeLog 47538 +SHA256 297678904e5206f7d5ff2f95c84e23f7560a893e63118190ead0e58225575036 ChangeLog 47538 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.23-r6.ebuild b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild index c28057de4160..80a528cb0d70 100644 --- a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild +++ b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild @@ -1,8 +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.23-r6.ebuild,v 1.3 2007/07/01 17:07:07 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.4 2007/07/01 17:29:23 wltjr Exp $ -#WANT_ANT_TASKS="ant-trax" +WANT_ANT_TASKS="ant-trax" inherit eutils java-pkg-2 java-ant-2 @@ -48,8 +48,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.2* )" DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) - ${RDEPEND} - || ( dev-java/ant-trax dev-java/ant-tasks ) " + ${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -161,8 +160,7 @@ src_compile(){ antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" fi - # prevent classpath bloat with ant-1.7.0 which makes admin app fail - ANT_TASKS="ant-trax" eant ${antflags} + eant ${antflags} } src_install() { |