| 1 |
commit: 23f2ba7e6d66da6a2e9fd7734032b9a066745ed3 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 9 14:56:29 2017 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 9 14:56:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f2ba7e |
| 7 |
|
| 8 |
www-servers/tomcat: replaced java_prepare with src_prepare in versions 8.0.x and version bump in slot 8 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
www-servers/tomcat/Manifest | 1 + |
| 13 |
.../tomcat/files/tomcat-8.0.41-build.xml.patch | 259 +++++++++++++++++++++ |
| 14 |
.../tomcat/files/tomcat-8.0.43-build.xml.patch | 259 +++++++++++++++++++++ |
| 15 |
www-servers/tomcat/tomcat-8.0.39.ebuild | 6 +- |
| 16 |
www-servers/tomcat/tomcat-8.0.41.ebuild | 6 +- |
| 17 |
.../{tomcat-8.0.41.ebuild => tomcat-8.0.43.ebuild} | 6 +- |
| 18 |
6 files changed, 534 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
| 21 |
index 59cf8dc4425..9c4b1f71406 100644 |
| 22 |
--- a/www-servers/tomcat/Manifest |
| 23 |
+++ b/www-servers/tomcat/Manifest |
| 24 |
@@ -4,6 +4,7 @@ DIST apache-tomcat-7.0.76-src.tar.gz 4662334 SHA256 67e8449ed9e5e33251e19c38f6db |
| 25 |
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6 |
| 26 |
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752 |
| 27 |
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8 |
| 28 |
+DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414 |
| 29 |
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d |
| 30 |
DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5 |
| 31 |
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6 |
| 32 |
|
| 33 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..cefd59f55ae |
| 36 |
--- /dev/null |
| 37 |
+++ b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch |
| 38 |
@@ -0,0 +1,259 @@ |
| 39 |
+diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml |
| 40 |
+index 1ba0dae..81a0a2c 100644 |
| 41 |
+--- a/apache-tomcat-8.0.36-src/build.xml |
| 42 |
++++ b/apache-tomcat-8.0.36-src/build.xml |
| 43 |
+@@ -701,24 +701,29 @@ |
| 44 |
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
| 45 |
+ |
| 46 |
+ <!-- Servlet 3.1 Implementation JAR File --> |
| 47 |
++<!-- |
| 48 |
+ <jarIt jarfile="${servlet-api.jar}" |
| 49 |
+ filesDir="${tomcat.classes}" |
| 50 |
+ filesId="files.servlet-api" |
| 51 |
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
| 52 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
| 53 |
+ license="${tomcat.manifests}/servlet-api.jar.license" /> |
| 54 |
+- |
| 55 |
++--> |
| 56 |
+ <!-- JSP 2.3 Implementation JAR File --> |
| 57 |
++<!-- |
| 58 |
+ <jarIt jarfile="${jsp-api.jar}" |
| 59 |
+ filesDir="${tomcat.classes}" |
| 60 |
+ filesId="files.jsp-api" |
| 61 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
| 62 |
++--> |
| 63 |
+ |
| 64 |
+ <!-- EL 3.0 Implementation JAR File --> |
| 65 |
++<!-- |
| 66 |
+ <jarIt jarfile="${el-api.jar}" |
| 67 |
+ filesDir="${tomcat.classes}" |
| 68 |
+ filesId="files.el-api" |
| 69 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
| 70 |
++--> |
| 71 |
+ |
| 72 |
+ <!-- WebSocket 1.1 API JAR File --> |
| 73 |
+ <jarIt jarfile="${websocket-api.jar}" |
| 74 |
+@@ -986,14 +991,14 @@ |
| 75 |
+ |
| 76 |
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
| 77 |
+ description="Default. Builds a working Tomcat instance"> |
| 78 |
+- |
| 79 |
++<!-- |
| 80 |
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
| 81 |
+ file="${tomcat-native.tar.gz}" /> |
| 82 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
| 83 |
+ file="${commons-daemon.native.src.tgz}" /> |
| 84 |
+ |
| 85 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
| 86 |
+- |
| 87 |
++--> |
| 88 |
+ <!-- Copy scripts --> |
| 89 |
+ <copy todir="${tomcat.build}/bin"> |
| 90 |
+ <fileset dir="bin"> |
| 91 |
+@@ -1053,7 +1058,7 @@ |
| 92 |
+ <exclude name="${jdt.jar.filename}"/> |
| 93 |
+ </fileset> |
| 94 |
+ </delete> |
| 95 |
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
| 96 |
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
| 97 |
+ |
| 98 |
+ <!-- Add sources for examples --> |
| 99 |
+ <antcall target="examples-sources" /> |
| 100 |
+@@ -1087,7 +1092,7 @@ |
| 101 |
+ </javac> |
| 102 |
+ </target> |
| 103 |
+ |
| 104 |
+- <target name="build-tomcat-jdbc" depends="package"> |
| 105 |
++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
| 106 |
+ <!-- build the jdbc-pool jar and source jar--> |
| 107 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
| 108 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
| 109 |
+@@ -1102,7 +1107,7 @@ |
| 110 |
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
| 111 |
+ </target> |
| 112 |
+ |
| 113 |
+- <target name="build-tomcat-jdbc-src"> |
| 114 |
++ <target name="build-tomcat-jdbc-src" unless="noget"> |
| 115 |
+ <!-- build the jdbc-pool source jar--> |
| 116 |
+ <echo message="Building Tomcat JDBC pool src JAR"/> |
| 117 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
| 118 |
+@@ -1206,10 +1211,11 @@ |
| 119 |
+ |
| 120 |
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
| 121 |
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
| 122 |
++<!-- |
| 123 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
| 124 |
+ failonerror="false"/> |
| 125 |
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
| 126 |
+- |
| 127 |
++--> |
| 128 |
+ <!-- Note the meta-inf below will work as long as there is only one JAR |
| 129 |
+ that needs to add entries. If there is more than one a more complex |
| 130 |
+ solution will be required. --> |
| 131 |
+@@ -1594,7 +1600,7 @@ |
| 132 |
+ |
| 133 |
+ <target name="extras-commons-logging-prepare" |
| 134 |
+ depends="extras-prepare" |
| 135 |
+- description="Prepare to build web services extras package"> |
| 136 |
++ description="Prepare to build web services extras package" unless="noget"> |
| 137 |
+ |
| 138 |
+ <antcall target="downloadfile-2"> |
| 139 |
+ <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
| 140 |
+@@ -1733,7 +1739,7 @@ |
| 141 |
+ |
| 142 |
+ <target name="extras-webservices-prepare" |
| 143 |
+ depends="extras-prepare" |
| 144 |
+- description="Prepare to build web services extras package"> |
| 145 |
++ description="Prepare to build web services extras package" unless="noget"> |
| 146 |
+ |
| 147 |
+ <antcall target="downloadfile"> |
| 148 |
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
| 149 |
+@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
| 150 |
+ |
| 151 |
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
| 152 |
+ description="Create the Tomcat javadoc" > |
| 153 |
++<!-- |
| 154 |
+ <javadoc packagenames="javax.servlet.*" |
| 155 |
+ excludepackagenames="javax.servlet.jsp.*" |
| 156 |
+ sourcepath="${tomcat.dist}/src/java" |
| 157 |
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
| 158 |
+ <path location="${ant.core.lib}"/> |
| 159 |
+ </classpath> |
| 160 |
+ </javadoc> |
| 161 |
++--> |
| 162 |
+ <javadoc packagenames="javax.websocket.*" |
| 163 |
+ sourcepath="${tomcat.dist}/src/java" |
| 164 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
| 165 |
+@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
| 166 |
+ <path refid="tomcat.webservices.classpath"/> |
| 167 |
+ <path location="${ant.core.lib}"/> |
| 168 |
+ </classpath> |
| 169 |
++<!-- |
| 170 |
+ <link href="../servletapi"/> |
| 171 |
+ <link href="../jspapi"/> |
| 172 |
+ <link href="../elapi"/> |
| 173 |
++--> |
| 174 |
+ <link href="../websocketapi"/> |
| 175 |
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
| 176 |
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
| 177 |
+@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> |
| 178 |
+ </target> |
| 179 |
+ |
| 180 |
+ <target name="download-compile" |
| 181 |
+- description="Download (and build) components necessary to compile" > |
| 182 |
++ description="Download (and build) components necessary to compile" unless="noget"> |
| 183 |
+ |
| 184 |
+ <antcall target="downloadfile-2"> |
| 185 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
| 186 |
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> |
| 187 |
+ </target> |
| 188 |
+ |
| 189 |
+ <target name="download-test-compile" |
| 190 |
+- description="Download additional components for the tests" > |
| 191 |
++ description="Download additional components for the tests" unless="noget"> |
| 192 |
+ |
| 193 |
+ <antcall target="downloadfile"> |
| 194 |
+ <param name="sourcefile" value="${junit.loc}"/> |
| 195 |
+@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> |
| 196 |
+ </target> |
| 197 |
+ |
| 198 |
+ <target name="download-dist" |
| 199 |
+- description="Download additional components for a distribution" > |
| 200 |
++ description="Download additional components for a distribution" unless="noget"> |
| 201 |
+ |
| 202 |
+ <antcall target="downloadzip-2"> |
| 203 |
+ <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
| 204 |
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> |
| 205 |
+ |
| 206 |
+ <!-- =============== Utility Targets to support downloads ================ --> |
| 207 |
+ |
| 208 |
+- <target name="setproxy" if="${proxy.use}"> |
| 209 |
++ <target name="setproxy" if="${proxy.use}" unless="noget"> |
| 210 |
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
| 211 |
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
| 212 |
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
| 213 |
+ </target> |
| 214 |
+ |
| 215 |
+- <target name="testexist"> |
| 216 |
++ <target name="testexist" unless="noget"> |
| 217 |
+ <echo message="Testing for ${destfile}"/> |
| 218 |
+ <available file="${destfile}" property="exist"/> |
| 219 |
+ </target> |
| 220 |
+ |
| 221 |
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
| 222 |
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
| 223 |
+ <!-- Download and extract the package --> |
| 224 |
+ <local name="temp.file"/> |
| 225 |
+ <mkdir dir="${base.path}"/> |
| 226 |
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> |
| 227 |
+ <delete file="${temp.file}.tar.gz"/> |
| 228 |
+ </target> |
| 229 |
+ |
| 230 |
+- <target name="downloadgz-2" unless="exist" depends="testexist"> |
| 231 |
++ <target name="downloadgz-2" unless="noget" depends="testexist"> |
| 232 |
+ <!-- Download and extract the package from the two alternative locations --> |
| 233 |
+ <local name="temp.file"/> |
| 234 |
+ <mkdir dir="${base.path}"/> |
| 235 |
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> |
| 236 |
+ <delete file="${temp.file}.tar.gz"/> |
| 237 |
+ </target> |
| 238 |
+ |
| 239 |
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
| 240 |
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
| 241 |
+ <!-- Download and extract the package --> |
| 242 |
+ <local name="temp.file"/> |
| 243 |
+ <mkdir dir="${base.path}"/> |
| 244 |
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> |
| 245 |
+ <delete file="${temp.file}"/> |
| 246 |
+ </target> |
| 247 |
+ |
| 248 |
+- <target name="downloadzip-2" unless="exist" depends="testexist"> |
| 249 |
++ <target name="downloadzip-2" unless="noget" depends="testexist"> |
| 250 |
+ <!-- Download and extract the package from the two alternative locations --> |
| 251 |
+ <local name="temp.file"/> |
| 252 |
+ <mkdir dir="${base.path}"/> |
| 253 |
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> |
| 254 |
+ <delete file="${temp.file}"/> |
| 255 |
+ </target> |
| 256 |
+ |
| 257 |
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
| 258 |
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
| 259 |
+ <!-- Download the file --> |
| 260 |
+ <local name="temp.file"/> |
| 261 |
+ <mkdir dir="${base.path}"/> |
| 262 |
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> |
| 263 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
| 264 |
+ </target> |
| 265 |
+ |
| 266 |
+- <target name="downloadfile-2" unless="exist" depends="testexist"> |
| 267 |
++ <target name="downloadfile-2" unless="noget" depends="testexist"> |
| 268 |
+ <!-- Download the file from the two alternative locations --> |
| 269 |
+ <local name="temp.file"/> |
| 270 |
+ <mkdir dir="${base.path}"/> |
| 271 |
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> |
| 272 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
| 273 |
+ </target> |
| 274 |
+ |
| 275 |
+- <target name="trydownload.check" depends="setproxy"> |
| 276 |
++ <target name="trydownload.check" depends="setproxy" unless="noget"> |
| 277 |
+ <condition property="trydownload.run"> |
| 278 |
+ <and> |
| 279 |
+ <not> |
| 280 |
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> |
| 281 |
+ </condition> |
| 282 |
+ </target> |
| 283 |
+ |
| 284 |
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
| 285 |
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
| 286 |
+ <!-- Downloads a file if not yet downloaded and the source URL is available --> |
| 287 |
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
| 288 |
+ </target> |
| 289 |
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> |
| 290 |
+ |
| 291 |
+ <target name="ide-eclipse" |
| 292 |
+ depends="download-compile, extras-webservices-prepare, download-test-compile" |
| 293 |
+- description="Prepares the source tree to be built in Eclipse"> |
| 294 |
++ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
| 295 |
+ |
| 296 |
+ <!-- Copy the sample project files into the root directory --> |
| 297 |
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
| 298 |
|
| 299 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch |
| 300 |
new file mode 100644 |
| 301 |
index 00000000000..cefd59f55ae |
| 302 |
--- /dev/null |
| 303 |
+++ b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch |
| 304 |
@@ -0,0 +1,259 @@ |
| 305 |
+diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml |
| 306 |
+index 1ba0dae..81a0a2c 100644 |
| 307 |
+--- a/apache-tomcat-8.0.36-src/build.xml |
| 308 |
++++ b/apache-tomcat-8.0.36-src/build.xml |
| 309 |
+@@ -701,24 +701,29 @@ |
| 310 |
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
| 311 |
+ |
| 312 |
+ <!-- Servlet 3.1 Implementation JAR File --> |
| 313 |
++<!-- |
| 314 |
+ <jarIt jarfile="${servlet-api.jar}" |
| 315 |
+ filesDir="${tomcat.classes}" |
| 316 |
+ filesId="files.servlet-api" |
| 317 |
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
| 318 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
| 319 |
+ license="${tomcat.manifests}/servlet-api.jar.license" /> |
| 320 |
+- |
| 321 |
++--> |
| 322 |
+ <!-- JSP 2.3 Implementation JAR File --> |
| 323 |
++<!-- |
| 324 |
+ <jarIt jarfile="${jsp-api.jar}" |
| 325 |
+ filesDir="${tomcat.classes}" |
| 326 |
+ filesId="files.jsp-api" |
| 327 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
| 328 |
++--> |
| 329 |
+ |
| 330 |
+ <!-- EL 3.0 Implementation JAR File --> |
| 331 |
++<!-- |
| 332 |
+ <jarIt jarfile="${el-api.jar}" |
| 333 |
+ filesDir="${tomcat.classes}" |
| 334 |
+ filesId="files.el-api" |
| 335 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
| 336 |
++--> |
| 337 |
+ |
| 338 |
+ <!-- WebSocket 1.1 API JAR File --> |
| 339 |
+ <jarIt jarfile="${websocket-api.jar}" |
| 340 |
+@@ -986,14 +991,14 @@ |
| 341 |
+ |
| 342 |
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
| 343 |
+ description="Default. Builds a working Tomcat instance"> |
| 344 |
+- |
| 345 |
++<!-- |
| 346 |
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
| 347 |
+ file="${tomcat-native.tar.gz}" /> |
| 348 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
| 349 |
+ file="${commons-daemon.native.src.tgz}" /> |
| 350 |
+ |
| 351 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
| 352 |
+- |
| 353 |
++--> |
| 354 |
+ <!-- Copy scripts --> |
| 355 |
+ <copy todir="${tomcat.build}/bin"> |
| 356 |
+ <fileset dir="bin"> |
| 357 |
+@@ -1053,7 +1058,7 @@ |
| 358 |
+ <exclude name="${jdt.jar.filename}"/> |
| 359 |
+ </fileset> |
| 360 |
+ </delete> |
| 361 |
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
| 362 |
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
| 363 |
+ |
| 364 |
+ <!-- Add sources for examples --> |
| 365 |
+ <antcall target="examples-sources" /> |
| 366 |
+@@ -1087,7 +1092,7 @@ |
| 367 |
+ </javac> |
| 368 |
+ </target> |
| 369 |
+ |
| 370 |
+- <target name="build-tomcat-jdbc" depends="package"> |
| 371 |
++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
| 372 |
+ <!-- build the jdbc-pool jar and source jar--> |
| 373 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
| 374 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
| 375 |
+@@ -1102,7 +1107,7 @@ |
| 376 |
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
| 377 |
+ </target> |
| 378 |
+ |
| 379 |
+- <target name="build-tomcat-jdbc-src"> |
| 380 |
++ <target name="build-tomcat-jdbc-src" unless="noget"> |
| 381 |
+ <!-- build the jdbc-pool source jar--> |
| 382 |
+ <echo message="Building Tomcat JDBC pool src JAR"/> |
| 383 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
| 384 |
+@@ -1206,10 +1211,11 @@ |
| 385 |
+ |
| 386 |
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
| 387 |
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
| 388 |
++<!-- |
| 389 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
| 390 |
+ failonerror="false"/> |
| 391 |
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
| 392 |
+- |
| 393 |
++--> |
| 394 |
+ <!-- Note the meta-inf below will work as long as there is only one JAR |
| 395 |
+ that needs to add entries. If there is more than one a more complex |
| 396 |
+ solution will be required. --> |
| 397 |
+@@ -1594,7 +1600,7 @@ |
| 398 |
+ |
| 399 |
+ <target name="extras-commons-logging-prepare" |
| 400 |
+ depends="extras-prepare" |
| 401 |
+- description="Prepare to build web services extras package"> |
| 402 |
++ description="Prepare to build web services extras package" unless="noget"> |
| 403 |
+ |
| 404 |
+ <antcall target="downloadfile-2"> |
| 405 |
+ <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
| 406 |
+@@ -1733,7 +1739,7 @@ |
| 407 |
+ |
| 408 |
+ <target name="extras-webservices-prepare" |
| 409 |
+ depends="extras-prepare" |
| 410 |
+- description="Prepare to build web services extras package"> |
| 411 |
++ description="Prepare to build web services extras package" unless="noget"> |
| 412 |
+ |
| 413 |
+ <antcall target="downloadfile"> |
| 414 |
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
| 415 |
+@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
| 416 |
+ |
| 417 |
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
| 418 |
+ description="Create the Tomcat javadoc" > |
| 419 |
++<!-- |
| 420 |
+ <javadoc packagenames="javax.servlet.*" |
| 421 |
+ excludepackagenames="javax.servlet.jsp.*" |
| 422 |
+ sourcepath="${tomcat.dist}/src/java" |
| 423 |
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
| 424 |
+ <path location="${ant.core.lib}"/> |
| 425 |
+ </classpath> |
| 426 |
+ </javadoc> |
| 427 |
++--> |
| 428 |
+ <javadoc packagenames="javax.websocket.*" |
| 429 |
+ sourcepath="${tomcat.dist}/src/java" |
| 430 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
| 431 |
+@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
| 432 |
+ <path refid="tomcat.webservices.classpath"/> |
| 433 |
+ <path location="${ant.core.lib}"/> |
| 434 |
+ </classpath> |
| 435 |
++<!-- |
| 436 |
+ <link href="../servletapi"/> |
| 437 |
+ <link href="../jspapi"/> |
| 438 |
+ <link href="../elapi"/> |
| 439 |
++--> |
| 440 |
+ <link href="../websocketapi"/> |
| 441 |
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
| 442 |
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
| 443 |
+@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> |
| 444 |
+ </target> |
| 445 |
+ |
| 446 |
+ <target name="download-compile" |
| 447 |
+- description="Download (and build) components necessary to compile" > |
| 448 |
++ description="Download (and build) components necessary to compile" unless="noget"> |
| 449 |
+ |
| 450 |
+ <antcall target="downloadfile-2"> |
| 451 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
| 452 |
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> |
| 453 |
+ </target> |
| 454 |
+ |
| 455 |
+ <target name="download-test-compile" |
| 456 |
+- description="Download additional components for the tests" > |
| 457 |
++ description="Download additional components for the tests" unless="noget"> |
| 458 |
+ |
| 459 |
+ <antcall target="downloadfile"> |
| 460 |
+ <param name="sourcefile" value="${junit.loc}"/> |
| 461 |
+@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> |
| 462 |
+ </target> |
| 463 |
+ |
| 464 |
+ <target name="download-dist" |
| 465 |
+- description="Download additional components for a distribution" > |
| 466 |
++ description="Download additional components for a distribution" unless="noget"> |
| 467 |
+ |
| 468 |
+ <antcall target="downloadzip-2"> |
| 469 |
+ <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
| 470 |
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> |
| 471 |
+ |
| 472 |
+ <!-- =============== Utility Targets to support downloads ================ --> |
| 473 |
+ |
| 474 |
+- <target name="setproxy" if="${proxy.use}"> |
| 475 |
++ <target name="setproxy" if="${proxy.use}" unless="noget"> |
| 476 |
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
| 477 |
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
| 478 |
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
| 479 |
+ </target> |
| 480 |
+ |
| 481 |
+- <target name="testexist"> |
| 482 |
++ <target name="testexist" unless="noget"> |
| 483 |
+ <echo message="Testing for ${destfile}"/> |
| 484 |
+ <available file="${destfile}" property="exist"/> |
| 485 |
+ </target> |
| 486 |
+ |
| 487 |
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
| 488 |
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
| 489 |
+ <!-- Download and extract the package --> |
| 490 |
+ <local name="temp.file"/> |
| 491 |
+ <mkdir dir="${base.path}"/> |
| 492 |
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> |
| 493 |
+ <delete file="${temp.file}.tar.gz"/> |
| 494 |
+ </target> |
| 495 |
+ |
| 496 |
+- <target name="downloadgz-2" unless="exist" depends="testexist"> |
| 497 |
++ <target name="downloadgz-2" unless="noget" depends="testexist"> |
| 498 |
+ <!-- Download and extract the package from the two alternative locations --> |
| 499 |
+ <local name="temp.file"/> |
| 500 |
+ <mkdir dir="${base.path}"/> |
| 501 |
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> |
| 502 |
+ <delete file="${temp.file}.tar.gz"/> |
| 503 |
+ </target> |
| 504 |
+ |
| 505 |
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
| 506 |
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
| 507 |
+ <!-- Download and extract the package --> |
| 508 |
+ <local name="temp.file"/> |
| 509 |
+ <mkdir dir="${base.path}"/> |
| 510 |
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> |
| 511 |
+ <delete file="${temp.file}"/> |
| 512 |
+ </target> |
| 513 |
+ |
| 514 |
+- <target name="downloadzip-2" unless="exist" depends="testexist"> |
| 515 |
++ <target name="downloadzip-2" unless="noget" depends="testexist"> |
| 516 |
+ <!-- Download and extract the package from the two alternative locations --> |
| 517 |
+ <local name="temp.file"/> |
| 518 |
+ <mkdir dir="${base.path}"/> |
| 519 |
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> |
| 520 |
+ <delete file="${temp.file}"/> |
| 521 |
+ </target> |
| 522 |
+ |
| 523 |
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
| 524 |
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
| 525 |
+ <!-- Download the file --> |
| 526 |
+ <local name="temp.file"/> |
| 527 |
+ <mkdir dir="${base.path}"/> |
| 528 |
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> |
| 529 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
| 530 |
+ </target> |
| 531 |
+ |
| 532 |
+- <target name="downloadfile-2" unless="exist" depends="testexist"> |
| 533 |
++ <target name="downloadfile-2" unless="noget" depends="testexist"> |
| 534 |
+ <!-- Download the file from the two alternative locations --> |
| 535 |
+ <local name="temp.file"/> |
| 536 |
+ <mkdir dir="${base.path}"/> |
| 537 |
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> |
| 538 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
| 539 |
+ </target> |
| 540 |
+ |
| 541 |
+- <target name="trydownload.check" depends="setproxy"> |
| 542 |
++ <target name="trydownload.check" depends="setproxy" unless="noget"> |
| 543 |
+ <condition property="trydownload.run"> |
| 544 |
+ <and> |
| 545 |
+ <not> |
| 546 |
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> |
| 547 |
+ </condition> |
| 548 |
+ </target> |
| 549 |
+ |
| 550 |
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
| 551 |
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
| 552 |
+ <!-- Downloads a file if not yet downloaded and the source URL is available --> |
| 553 |
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
| 554 |
+ </target> |
| 555 |
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> |
| 556 |
+ |
| 557 |
+ <target name="ide-eclipse" |
| 558 |
+ depends="download-compile, extras-webservices-prepare, download-test-compile" |
| 559 |
+- description="Prepares the source tree to be built in Eclipse"> |
| 560 |
++ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
| 561 |
+ |
| 562 |
+ <!-- Copy the sample project files into the root directory --> |
| 563 |
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
| 564 |
|
| 565 |
diff --git a/www-servers/tomcat/tomcat-8.0.39.ebuild b/www-servers/tomcat/tomcat-8.0.39.ebuild |
| 566 |
index 81596bae336..4fffdde7178 100644 |
| 567 |
--- a/www-servers/tomcat/tomcat-8.0.39.ebuild |
| 568 |
+++ b/www-servers/tomcat/tomcat-8.0.39.ebuild |
| 569 |
@@ -44,7 +44,9 @@ pkg_setup() { |
| 570 |
enewuser tomcat 265 -1 /dev/null tomcat |
| 571 |
} |
| 572 |
|
| 573 |
-java_prepare() { |
| 574 |
+src_prepare() { |
| 575 |
+ default |
| 576 |
+ |
| 577 |
find -name '*.jar' -type f -delete -print || die |
| 578 |
|
| 579 |
# Remove bundled servlet-api |
| 580 |
@@ -56,6 +58,8 @@ java_prepare() { |
| 581 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 582 |
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
| 583 |
bin/catalina.sh || die |
| 584 |
+ |
| 585 |
+ java-pkg-2_src_prepare |
| 586 |
} |
| 587 |
|
| 588 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 589 |
|
| 590 |
diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.41.ebuild |
| 591 |
index 9ef90f30cda..9d2c9ff6392 100644 |
| 592 |
--- a/www-servers/tomcat/tomcat-8.0.41.ebuild |
| 593 |
+++ b/www-servers/tomcat/tomcat-8.0.41.ebuild |
| 594 |
@@ -44,7 +44,9 @@ pkg_setup() { |
| 595 |
enewuser tomcat 265 -1 /dev/null tomcat |
| 596 |
} |
| 597 |
|
| 598 |
-java_prepare() { |
| 599 |
+src_prepare() { |
| 600 |
+ default |
| 601 |
+ |
| 602 |
find -name '*.jar' -type f -delete -print || die |
| 603 |
|
| 604 |
# Remove bundled servlet-api |
| 605 |
@@ -56,6 +58,8 @@ java_prepare() { |
| 606 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 607 |
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
| 608 |
bin/catalina.sh || die |
| 609 |
+ |
| 610 |
+ java-pkg-2_src_prepare |
| 611 |
} |
| 612 |
|
| 613 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 614 |
|
| 615 |
diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.43.ebuild |
| 616 |
similarity index 98% |
| 617 |
copy from www-servers/tomcat/tomcat-8.0.41.ebuild |
| 618 |
copy to www-servers/tomcat/tomcat-8.0.43.ebuild |
| 619 |
index 9ef90f30cda..9d2c9ff6392 100644 |
| 620 |
--- a/www-servers/tomcat/tomcat-8.0.41.ebuild |
| 621 |
+++ b/www-servers/tomcat/tomcat-8.0.43.ebuild |
| 622 |
@@ -44,7 +44,9 @@ pkg_setup() { |
| 623 |
enewuser tomcat 265 -1 /dev/null tomcat |
| 624 |
} |
| 625 |
|
| 626 |
-java_prepare() { |
| 627 |
+src_prepare() { |
| 628 |
+ default |
| 629 |
+ |
| 630 |
find -name '*.jar' -type f -delete -print || die |
| 631 |
|
| 632 |
# Remove bundled servlet-api |
| 633 |
@@ -56,6 +58,8 @@ java_prepare() { |
| 634 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 635 |
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
| 636 |
bin/catalina.sh || die |
| 637 |
+ |
| 638 |
+ java-pkg-2_src_prepare |
| 639 |
} |
| 640 |
|
| 641 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
Archives