From 7d768a7b96d6a26d5970b2c12e722f07757da1a5 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Mon, 2 Apr 2007 16:24:29 +0000 Subject: [PATCH] Modified ebuild to work with split-ant, or not since it needs to be stabilized ASAP, and split ant is not stable yet. Package-Manager: portage-2.1.2.2 --- www-servers/tomcat/ChangeLog | 9 +++++++- www-servers/tomcat/Manifest | 22 +++++++++---------- ...-tomcat-5.5.23 => digest-tomcat-5.5.23-r1} | 0 ...-5.5.23.ebuild => tomcat-5.5.23-r1.ebuild} | 7 +++--- 4 files changed, 23 insertions(+), 15 deletions(-) rename www-servers/tomcat/files/{digest-tomcat-5.5.23 => digest-tomcat-5.5.23-r1} (100%) rename www-servers/tomcat/{tomcat-5.5.23.ebuild => tomcat-5.5.23-r1.ebuild} (98%) diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 6f1b86f154ef..0da8cad6112d 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,13 @@ # 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.129 2007/03/30 23:17:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.130 2007/04/02 16:24:29 wltjr Exp $ + +*tomcat-5.5.23-r1 (02 Apr 2007) + + 02 Apr 2007; William L. Thomson Jr. + -tomcat-5.5.23.ebuild, +tomcat-5.5.23-r1.ebuild: + Modified ebuild to work with split-ant, or not since it needs to be + stabilized ASAP, and split ant is not stable yet. 30 Mar 2007; William L. Thomson Jr. tomcat-5.5.20-r8.ebuild, tomcat-5.5.23.ebuild, tomcat-6.0.10-r1.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 4cd38a230af0..0497f3d82e83 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -93,18 +93,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10244 RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee MD5 b35390dd66d703bef0d76905378f3f8c tomcat-5.5.20-r8.ebuild 10244 RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee031c tomcat-5.5.20-r8.ebuild 10244 SHA256 215bb2f0f8ef97b47f2003c5c79862b54243a0decb52d965a51af45590f93ec9 tomcat-5.5.20-r8.ebuild 10244 -EBUILD tomcat-5.5.23.ebuild 10536 RMD160 04b34cdf8b4a7f94ac6f27675329f56934483a08 SHA1 230d6461f32f638e1d6be8670de6a053b169efd8 SHA256 8441ec3f77be4ed8a9f61b2d74386ff423b124f027a1e29acb3a40bff49a6cbb -MD5 776a987f7a5678daac42a02ecb01e331 tomcat-5.5.23.ebuild 10536 -RMD160 04b34cdf8b4a7f94ac6f27675329f56934483a08 tomcat-5.5.23.ebuild 10536 -SHA256 8441ec3f77be4ed8a9f61b2d74386ff423b124f027a1e29acb3a40bff49a6cbb tomcat-5.5.23.ebuild 10536 +EBUILD tomcat-5.5.23-r1.ebuild 10586 RMD160 68b348b5cd512de49a277c39e0ade0c8f877161c SHA1 d7a08e474d8f12d35c5eae11450eb3bc19cc89b2 SHA256 d4618860e9fd2da7c501d021fa1c68c6d4d945c9d2aeaf4dfc27dcf2e0eda625 +MD5 218569e768631547f9c812c9a0ebb7f6 tomcat-5.5.23-r1.ebuild 10586 +RMD160 68b348b5cd512de49a277c39e0ade0c8f877161c tomcat-5.5.23-r1.ebuild 10586 +SHA256 d4618860e9fd2da7c501d021fa1c68c6d4d945c9d2aeaf4dfc27dcf2e0eda625 tomcat-5.5.23-r1.ebuild 10586 EBUILD tomcat-6.0.10-r1.ebuild 5020 RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 SHA1 3dc49b928e184a0f7a09f0169c61d6beb836840a SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2 MD5 d10ccf2250d5978776b327eb2114abc0 tomcat-6.0.10-r1.ebuild 5020 RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 tomcat-6.0.10-r1.ebuild 5020 SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2 tomcat-6.0.10-r1.ebuild 5020 -MISC ChangeLog 41890 RMD160 40f7991444e4fc1ca18f89537bddb73a2345aad0 SHA1 6b1a3718048934499f56a5b76ba07ce500fb7018 SHA256 0679fb55c75283a27f7d11b4c4455cd74e02035abda217738e6b49f4f402e9d9 -MD5 157940a8137073d799811c13cfcc5647 ChangeLog 41890 -RMD160 40f7991444e4fc1ca18f89537bddb73a2345aad0 ChangeLog 41890 -SHA256 0679fb55c75283a27f7d11b4c4455cd74e02035abda217738e6b49f4f402e9d9 ChangeLog 41890 +MISC ChangeLog 42154 RMD160 456ff023ee01fc3bd7ad131166caee537de8f070 SHA1 f6eefe0223a21621da61f089b9f53723d6483f84 SHA256 20d7f5b615b59c188d26c17142559200b53eee1d372219814216c6766d8be650 +MD5 d8e8d40805bd7e8c4d1316d6f2691fe5 ChangeLog 42154 +RMD160 456ff023ee01fc3bd7ad131166caee537de8f070 ChangeLog 42154 +SHA256 20d7f5b615b59c188d26c17142559200b53eee1d372219814216c6766d8be650 ChangeLog 42154 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -112,9 +112,9 @@ SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata 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 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23 277 -RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23 277 -SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23 277 +MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r1 277 +RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r1 277 +SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r1 277 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r1 277 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r1 277 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r1 277 diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r1 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-5.5.23 rename to www-servers/tomcat/files/digest-tomcat-5.5.23-r1 diff --git a/www-servers/tomcat/tomcat-5.5.23.ebuild b/www-servers/tomcat/tomcat-5.5.23-r1.ebuild similarity index 98% rename from www-servers/tomcat/tomcat-5.5.23.ebuild rename to www-servers/tomcat/tomcat-5.5.23-r1.ebuild index 2b46aa23279f..6d1f2222eaeb 100644 --- a/www-servers/tomcat/tomcat-5.5.23.ebuild +++ b/www-servers/tomcat/tomcat-5.5.23-r1.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.ebuild,v 1.3 2007/03/30 23:17:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r1.ebuild,v 1.1 2007/04/02 16:24:29 wltjr Exp $ -WANT_ANT_TASKS="ant-trax" +#WANT_ANT_TASKS="ant-trax" inherit eutils java-pkg-2 java-ant-2 @@ -47,7 +47,8 @@ RDEPEND="=dev-java/eclipse-ecj-3.2* )" DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) - ${RDEPEND}" + ${RDEPEND} + || ( dev-java/ant-trax dev-java/ant-tasks ) " S=${WORKDIR}/${MY_P} -- 2.26.2