1 |
commit: f3b5a325b1abf8a46b40f5455fb1e2f2893038b0 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 25 22:50:45 2015 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 25 22:53:28 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b5a325 |
7 |
|
8 |
www-servers/tomcat: Remove old |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
www-servers/tomcat/Manifest | 2 - |
13 |
.../tomcat/files/tomcat-7.0.63-build.xml.patch | 149 ------------ |
14 |
.../tomcat/files/tomcat-8.0.23-build.xml.patch | 230 ------------------ |
15 |
.../tomcat/files/tomcat-8.0.24-build.xml.patch | 265 --------------------- |
16 |
.../tomcat/files/tomcat-8.0.27-build.xml.patch | 265 --------------------- |
17 |
www-servers/tomcat/tomcat-8.0.23-r2.ebuild | 145 ----------- |
18 |
www-servers/tomcat/tomcat-8.0.27.ebuild | 147 ------------ |
19 |
www-servers/tomcat/tomcat-8.0.28.ebuild | 147 ------------ |
20 |
8 files changed, 1350 deletions(-) |
21 |
|
22 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
23 |
index af697ab..6e88e73 100644 |
24 |
--- a/www-servers/tomcat/Manifest |
25 |
+++ b/www-servers/tomcat/Manifest |
26 |
@@ -2,7 +2,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d |
27 |
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff |
28 |
DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51 |
29 |
DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d |
30 |
-DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88 |
31 |
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc |
32 |
-DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d |
33 |
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb |
34 |
|
35 |
diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch |
36 |
deleted file mode 100644 |
37 |
index 481591f..0000000 |
38 |
--- a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch |
39 |
+++ /dev/null |
40 |
@@ -1,149 +0,0 @@ |
41 |
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml |
42 |
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 |
43 |
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 |
44 |
-@@ -660,12 +660,14 @@ |
45 |
- </fileset> |
46 |
- </copy> |
47 |
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> |
48 |
-+<!-- |
49 |
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> |
50 |
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> |
51 |
- <include name="*" /> |
52 |
- <exclude name="jspxml*" /> |
53 |
- </fileset> |
54 |
- </copy> |
55 |
-+--> |
56 |
- |
57 |
- </target> |
58 |
- |
59 |
-@@ -721,26 +723,32 @@ |
60 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
61 |
- |
62 |
- <!-- Servlet 3.0 Implementation JAR File --> |
63 |
-+<!-- |
64 |
- <jarIt jarfile="${servlet-api.jar}" |
65 |
- filesDir="${tomcat.classes}" |
66 |
- filesId="files.servlet-api" |
67 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
68 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
69 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
70 |
-+--> |
71 |
- |
72 |
- <!-- JSP 2.2 Implementation JAR File --> |
73 |
-+<!-- |
74 |
- <jarIt jarfile="${jsp-api.jar}" |
75 |
- filesDir="${tomcat.classes}" |
76 |
- filesId="files.jsp-api" |
77 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
78 |
- notice="${tomcat.manifests}/jsp-api.jar.notice" |
79 |
- license="${tomcat.manifests}/jsp-api.jar.license" /> |
80 |
-+--> |
81 |
- |
82 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
83 |
-+<!-- |
84 |
- <jarIt jarfile="${el-api.jar}" |
85 |
- filesDir="${tomcat.classes}" |
86 |
- filesId="files.el-api" |
87 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
88 |
-+--> |
89 |
- |
90 |
- <!-- Bootstrap JAR File --> |
91 |
- <jarIt jarfile="${bootstrap.jar}" |
92 |
-@@ -986,12 +994,14 @@ |
93 |
- <target name="deploy" depends="package,build-docs,compile-webapp-examples" |
94 |
- description="Default. Builds a working Tomcat instance"> |
95 |
- |
96 |
-+<!-- |
97 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
98 |
- file="${tomcat-native.tar.gz}" /> |
99 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
100 |
- file="${commons-daemon.native.src.tgz}" /> |
101 |
- |
102 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
103 |
-+--> |
104 |
- |
105 |
- <!-- Copy scripts --> |
106 |
- <copy todir="${tomcat.build}/bin"> |
107 |
-@@ -1051,14 +1061,15 @@ |
108 |
- <exclude name="${jdt.jar.filename}"/> |
109 |
- </fileset> |
110 |
- </delete> |
111 |
-+<!-- |
112 |
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
113 |
-- |
114 |
-+--> |
115 |
- <!-- Add sources for examples --> |
116 |
- <antcall target="examples-sources" /> |
117 |
-- |
118 |
-+<!-- |
119 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
120 |
- failonerror="false"/> |
121 |
-- |
122 |
-+--> |
123 |
- <!-- build the jdbc-pool jar and source jar--> |
124 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
125 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
126 |
-@@ -1681,7 +1692,7 @@ |
127 |
- |
128 |
- <target name="extras-webservices-prepare" |
129 |
- depends="extras-prepare" |
130 |
-- description="Prepare to build web services extras package"> |
131 |
-+ description="Prepare to build web services extras package" unless="noget"> |
132 |
- |
133 |
- <antcall target="downloadfile"> |
134 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
135 |
-@@ -1886,6 +1897,7 @@ |
136 |
- description="Create the Tomcat javadoc" > |
137 |
- <fail unless="java.7.home" |
138 |
- message="The java.7.home property must be set for javadoc build"/> |
139 |
-+<!-- |
140 |
- <javadoc packagenames="javax.servlet.*" |
141 |
- excludepackagenames="javax.servlet.jsp.*" |
142 |
- sourcepath="${tomcat.dist}/src/java" |
143 |
-@@ -1947,6 +1959,7 @@ |
144 |
- <path location="${ant.core.lib}"/> |
145 |
- </classpath> |
146 |
- </javadoc> |
147 |
-+--> |
148 |
- <javadoc packagenames="javax.websocket.*" |
149 |
- sourcepath="${tomcat.dist}/src/java" |
150 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
151 |
-@@ -1985,9 +1998,11 @@ |
152 |
- <path refid="tomcat.webservices.classpath"/> |
153 |
- <path location="${ant.core.lib}"/> |
154 |
- </classpath> |
155 |
-+<!-- |
156 |
- <link href="../servletapi"/> |
157 |
- <link href="../jspapi"/> |
158 |
- <link href="../elapi"/> |
159 |
-+--> |
160 |
- <link href="../websocketapi"/> |
161 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
162 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
163 |
-@@ -2642,7 +2657,7 @@ |
164 |
- </target> |
165 |
- |
166 |
- <target name="download-compile" |
167 |
-- description="Download (and build) components necessary to compile" > |
168 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
169 |
- |
170 |
- <antcall target="downloadfile-2"> |
171 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
172 |
-@@ -2699,7 +2714,7 @@ |
173 |
- </target> |
174 |
- |
175 |
- <target name="download-test-compile" |
176 |
-- description="Download additional components for the tests" > |
177 |
-+ description="Download additional components for the tests" unless="noget"> |
178 |
- |
179 |
- <antcall target="downloadfile"> |
180 |
- <param name="sourcefile" value="${junit.loc}"/> |
181 |
-@@ -2727,7 +2742,7 @@ |
182 |
- </target> |
183 |
- |
184 |
- <target name="download-dist" |
185 |
-- description="Download additional components for a distribution" > |
186 |
-+ description="Download additional components for a distribution" unless="noget"> |
187 |
- |
188 |
- <antcall target="downloadzip-2"> |
189 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
190 |
|
191 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch |
192 |
deleted file mode 100644 |
193 |
index d747959..0000000 |
194 |
--- a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch |
195 |
+++ /dev/null |
196 |
@@ -1,230 +0,0 @@ |
197 |
-diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml |
198 |
---- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500 |
199 |
-+++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500 |
200 |
-@@ -703,24 +703,29 @@ |
201 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
202 |
- |
203 |
- <!-- Servlet 3.1 Implementation JAR File --> |
204 |
-+<!-- |
205 |
- <jarIt jarfile="${servlet-api.jar}" |
206 |
- filesDir="${tomcat.classes}" |
207 |
- filesId="files.servlet-api" |
208 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
209 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
210 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
211 |
-- |
212 |
-+--> |
213 |
- <!-- JSP 2.3 Implementation JAR File --> |
214 |
-+<!-- |
215 |
- <jarIt jarfile="${jsp-api.jar}" |
216 |
- filesDir="${tomcat.classes}" |
217 |
- filesId="files.jsp-api" |
218 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
219 |
-+--> |
220 |
- |
221 |
- <!-- EL 3.0 Implementation JAR File --> |
222 |
-+<!-- |
223 |
- <jarIt jarfile="${el-api.jar}" |
224 |
- filesDir="${tomcat.classes}" |
225 |
- filesId="files.el-api" |
226 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
227 |
-+--> |
228 |
- |
229 |
- <!-- WebSocket 1.1 API JAR File --> |
230 |
- <jarIt jarfile="${websocket-api.jar}" |
231 |
-@@ -992,14 +997,14 @@ |
232 |
- |
233 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
234 |
- description="Default. Builds a working Tomcat instance"> |
235 |
-- |
236 |
-+<!-- |
237 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
238 |
- file="${tomcat-native.tar.gz}" /> |
239 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
240 |
- file="${commons-daemon.native.src.tgz}" /> |
241 |
- |
242 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
243 |
-- |
244 |
-+--> |
245 |
- <!-- Copy scripts --> |
246 |
- <copy todir="${tomcat.build}/bin"> |
247 |
- <fileset dir="bin"> |
248 |
-@@ -1059,7 +1064,7 @@ |
249 |
- <exclude name="${jdt.jar.filename}"/> |
250 |
- </fileset> |
251 |
- </delete> |
252 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
253 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
254 |
- |
255 |
- <!-- Add sources for examples --> |
256 |
- <antcall target="examples-sources" /> |
257 |
-@@ -1093,7 +1098,7 @@ |
258 |
- </javac> |
259 |
- </target> |
260 |
- |
261 |
-- <target name="build-tomcat-jdbc" depends="package"> |
262 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
263 |
- <!-- build the jdbc-pool jar and source jar--> |
264 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
265 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
266 |
-@@ -1108,7 +1113,7 @@ |
267 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
268 |
- </target> |
269 |
- |
270 |
-- <target name="build-tomcat-jdbc-src"> |
271 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
272 |
- <!-- build the jdbc-pool source jar--> |
273 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
274 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
275 |
-@@ -1212,10 +1217,11 @@ |
276 |
- |
277 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
278 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
279 |
-+<!-- |
280 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
281 |
- failonerror="false"/> |
282 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
283 |
-- |
284 |
-+--> |
285 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
286 |
- that needs to add entries. If there is more than one a more complex |
287 |
- solution will be required. --> |
288 |
-@@ -1519,7 +1525,7 @@ |
289 |
- |
290 |
- <target name="extras-commons-logging-prepare" |
291 |
- depends="extras-prepare" |
292 |
-- description="Prepare to build web services extras package"> |
293 |
-+ description="Prepare to build web services extras package" unless="noget"> |
294 |
- |
295 |
- <antcall target="downloadfile-2"> |
296 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
297 |
-@@ -1658,7 +1664,7 @@ |
298 |
- |
299 |
- <target name="extras-webservices-prepare" |
300 |
- depends="extras-prepare" |
301 |
-- description="Prepare to build web services extras package"> |
302 |
-+ description="Prepare to build web services extras package" unless="noget"> |
303 |
- |
304 |
- <antcall target="downloadfile"> |
305 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
306 |
-@@ -2703,7 +2709,7 @@ |
307 |
- </target> |
308 |
- |
309 |
- <target name="download-compile" |
310 |
-- description="Download (and build) components necessary to compile" > |
311 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
312 |
- |
313 |
- <antcall target="downloadfile-2"> |
314 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
315 |
-@@ -2746,7 +2752,7 @@ |
316 |
- </target> |
317 |
- |
318 |
- <target name="download-test-compile" |
319 |
-- description="Download additional components for the tests" > |
320 |
-+ description="Download additional components for the tests" unless="noget"> |
321 |
- |
322 |
- <antcall target="downloadfile"> |
323 |
- <param name="sourcefile" value="${junit.loc}"/> |
324 |
-@@ -2792,7 +2798,7 @@ |
325 |
- </target> |
326 |
- |
327 |
- <target name="download-dist" |
328 |
-- description="Download additional components for a distribution" > |
329 |
-+ description="Download additional components for a distribution" unless="noget"> |
330 |
- |
331 |
- <antcall target="downloadzip-2"> |
332 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
333 |
-@@ -2818,18 +2824,18 @@ |
334 |
- |
335 |
- <!-- =============== Utility Targets to support downloads ================ --> |
336 |
- |
337 |
-- <target name="setproxy" if="${proxy.use}"> |
338 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
339 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
340 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
341 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
342 |
- </target> |
343 |
- |
344 |
-- <target name="testexist"> |
345 |
-+ <target name="testexist" unless="noget"> |
346 |
- <echo message="Testing for ${destfile}"/> |
347 |
- <available file="${destfile}" property="exist"/> |
348 |
- </target> |
349 |
- |
350 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
351 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
352 |
- <!-- Download and extract the package --> |
353 |
- <local name="temp.file"/> |
354 |
- <mkdir dir="${base.path}"/> |
355 |
-@@ -2841,7 +2847,7 @@ |
356 |
- <delete file="${temp.file}.tar.gz"/> |
357 |
- </target> |
358 |
- |
359 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
360 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
361 |
- <!-- Download and extract the package from the two alternative locations --> |
362 |
- <local name="temp.file"/> |
363 |
- <mkdir dir="${base.path}"/> |
364 |
-@@ -2860,7 +2866,7 @@ |
365 |
- <delete file="${temp.file}.tar.gz"/> |
366 |
- </target> |
367 |
- |
368 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
369 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
370 |
- <!-- Download and extract the package --> |
371 |
- <local name="temp.file"/> |
372 |
- <mkdir dir="${base.path}"/> |
373 |
-@@ -2871,7 +2877,7 @@ |
374 |
- <delete file="${temp.file}"/> |
375 |
- </target> |
376 |
- |
377 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
378 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
379 |
- <!-- Download and extract the package from the two alternative locations --> |
380 |
- <local name="temp.file"/> |
381 |
- <mkdir dir="${base.path}"/> |
382 |
-@@ -2889,7 +2895,7 @@ |
383 |
- <delete file="${temp.file}"/> |
384 |
- </target> |
385 |
- |
386 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
387 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
388 |
- <!-- Download the file --> |
389 |
- <local name="temp.file"/> |
390 |
- <mkdir dir="${base.path}"/> |
391 |
-@@ -2899,7 +2905,7 @@ |
392 |
- <move file="${temp.file}" tofile="${destfile}"/> |
393 |
- </target> |
394 |
- |
395 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
396 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
397 |
- <!-- Download the file from the two alternative locations --> |
398 |
- <local name="temp.file"/> |
399 |
- <mkdir dir="${base.path}"/> |
400 |
-@@ -2922,7 +2928,7 @@ |
401 |
- <move file="${temp.file}" tofile="${destfile}"/> |
402 |
- </target> |
403 |
- |
404 |
-- <target name="trydownload.check" depends="setproxy"> |
405 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
406 |
- <condition property="trydownload.run"> |
407 |
- <and> |
408 |
- <not> |
409 |
-@@ -2933,7 +2939,7 @@ |
410 |
- </condition> |
411 |
- </target> |
412 |
- |
413 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
414 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
415 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
416 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
417 |
- </target> |
418 |
-@@ -2944,7 +2950,7 @@ |
419 |
- |
420 |
- <target name="ide-eclipse" |
421 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
422 |
-- description="Prepares the source tree to be built in Eclipse"> |
423 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
424 |
- |
425 |
- <!-- Copy the sample project files into the root directory --> |
426 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
427 |
|
428 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch |
429 |
deleted file mode 100644 |
430 |
index 1923d23..0000000 |
431 |
--- a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch |
432 |
+++ /dev/null |
433 |
@@ -1,265 +0,0 @@ |
434 |
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml |
435 |
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100 |
436 |
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100 |
437 |
-@@ -697,24 +697,29 @@ |
438 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
439 |
- |
440 |
- <!-- Servlet 3.1 Implementation JAR File --> |
441 |
-+<!-- |
442 |
- <jarIt jarfile="${servlet-api.jar}" |
443 |
- filesDir="${tomcat.classes}" |
444 |
- filesId="files.servlet-api" |
445 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
446 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
447 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
448 |
-- |
449 |
-+--> |
450 |
- <!-- JSP 2.3 Implementation JAR File --> |
451 |
-+<!-- |
452 |
- <jarIt jarfile="${jsp-api.jar}" |
453 |
- filesDir="${tomcat.classes}" |
454 |
- filesId="files.jsp-api" |
455 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
456 |
-+--> |
457 |
- |
458 |
- <!-- EL 3.0 Implementation JAR File --> |
459 |
-+<!-- |
460 |
- <jarIt jarfile="${el-api.jar}" |
461 |
- filesDir="${tomcat.classes}" |
462 |
- filesId="files.el-api" |
463 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
464 |
-+--> |
465 |
- |
466 |
- <!-- WebSocket 1.1 API JAR File --> |
467 |
- <jarIt jarfile="${websocket-api.jar}" |
468 |
-@@ -982,14 +987,14 @@ |
469 |
- |
470 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
471 |
- description="Default. Builds a working Tomcat instance"> |
472 |
-- |
473 |
-+<!-- |
474 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
475 |
- file="${tomcat-native.tar.gz}" /> |
476 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
477 |
- file="${commons-daemon.native.src.tgz}" /> |
478 |
- |
479 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
480 |
-- |
481 |
-+--> |
482 |
- <!-- Copy scripts --> |
483 |
- <copy todir="${tomcat.build}/bin"> |
484 |
- <fileset dir="bin"> |
485 |
-@@ -1049,7 +1054,7 @@ |
486 |
- <exclude name="${jdt.jar.filename}"/> |
487 |
- </fileset> |
488 |
- </delete> |
489 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
490 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
491 |
- |
492 |
- <!-- Add sources for examples --> |
493 |
- <antcall target="examples-sources" /> |
494 |
-@@ -1083,7 +1088,7 @@ |
495 |
- </javac> |
496 |
- </target> |
497 |
- |
498 |
-- <target name="build-tomcat-jdbc" depends="package"> |
499 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
500 |
- <!-- build the jdbc-pool jar and source jar--> |
501 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
502 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
503 |
-@@ -1098,7 +1103,7 @@ |
504 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
505 |
- </target> |
506 |
- |
507 |
-- <target name="build-tomcat-jdbc-src"> |
508 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
509 |
- <!-- build the jdbc-pool source jar--> |
510 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
511 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
512 |
-@@ -1202,10 +1207,11 @@ |
513 |
- |
514 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
515 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
516 |
-+<!-- |
517 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
518 |
- failonerror="false"/> |
519 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
520 |
-- |
521 |
-+--> |
522 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
523 |
- that needs to add entries. If there is more than one a more complex |
524 |
- solution will be required. --> |
525 |
-@@ -1542,7 +1548,7 @@ |
526 |
- |
527 |
- <target name="extras-commons-logging-prepare" |
528 |
- depends="extras-prepare" |
529 |
-- description="Prepare to build web services extras package"> |
530 |
-+ description="Prepare to build web services extras package" unless="noget"> |
531 |
- |
532 |
- <antcall target="downloadfile-2"> |
533 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
534 |
-@@ -1681,7 +1687,7 @@ |
535 |
- |
536 |
- <target name="extras-webservices-prepare" |
537 |
- depends="extras-prepare" |
538 |
-- description="Prepare to build web services extras package"> |
539 |
-+ description="Prepare to build web services extras package" unless="noget"> |
540 |
- |
541 |
- <antcall target="downloadfile"> |
542 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
543 |
-@@ -1882,6 +1888,7 @@ |
544 |
- |
545 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
546 |
- description="Create the Tomcat javadoc" > |
547 |
-+<!-- |
548 |
- <javadoc packagenames="javax.servlet.*" |
549 |
- excludepackagenames="javax.servlet.jsp.*" |
550 |
- sourcepath="${tomcat.dist}/src/java" |
551 |
-@@ -1940,6 +1947,7 @@ |
552 |
- <path location="${ant.core.lib}"/> |
553 |
- </classpath> |
554 |
- </javadoc> |
555 |
-+--> |
556 |
- <javadoc packagenames="javax.websocket.*" |
557 |
- sourcepath="${tomcat.dist}/src/java" |
558 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
559 |
-@@ -1970,15 +1978,17 @@ |
560 |
- docencoding="UTF-8" |
561 |
- charset="UTF-8" |
562 |
- additionalparam="-breakiterator -notimestamp" |
563 |
-- maxmemory="256m" > |
564 |
-+ maxmemory="512m" > |
565 |
- <classpath> |
566 |
- <path refid="compile.classpath"/> |
567 |
- <path refid="tomcat.webservices.classpath"/> |
568 |
- <path location="${ant.core.lib}"/> |
569 |
- </classpath> |
570 |
-+<!-- |
571 |
- <link href="../servletapi"/> |
572 |
- <link href="../jspapi"/> |
573 |
- <link href="../elapi"/> |
574 |
-+--> |
575 |
- <link href="../websocketapi"/> |
576 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
577 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
578 |
-@@ -2739,7 +2749,7 @@ |
579 |
- </target> |
580 |
- |
581 |
- <target name="download-compile" |
582 |
-- description="Download (and build) components necessary to compile" > |
583 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
584 |
- |
585 |
- <antcall target="downloadfile-2"> |
586 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
587 |
-@@ -2773,7 +2783,7 @@ |
588 |
- </target> |
589 |
- |
590 |
- <target name="download-test-compile" |
591 |
-- description="Download additional components for the tests" > |
592 |
-+ description="Download additional components for the tests" unless="noget"> |
593 |
- |
594 |
- <antcall target="downloadfile"> |
595 |
- <param name="sourcefile" value="${junit.loc}"/> |
596 |
-@@ -2819,7 +2829,7 @@ |
597 |
- </target> |
598 |
- |
599 |
- <target name="download-dist" |
600 |
-- description="Download additional components for a distribution" > |
601 |
-+ description="Download additional components for a distribution" unless="noget"> |
602 |
- |
603 |
- <antcall target="downloadzip-2"> |
604 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
605 |
-@@ -2845,18 +2855,18 @@ |
606 |
- |
607 |
- <!-- =============== Utility Targets to support downloads ================ --> |
608 |
- |
609 |
-- <target name="setproxy" if="${proxy.use}"> |
610 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
611 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
612 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
613 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
614 |
- </target> |
615 |
- |
616 |
-- <target name="testexist"> |
617 |
-+ <target name="testexist" unless="noget"> |
618 |
- <echo message="Testing for ${destfile}"/> |
619 |
- <available file="${destfile}" property="exist"/> |
620 |
- </target> |
621 |
- |
622 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
623 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
624 |
- <!-- Download and extract the package --> |
625 |
- <local name="temp.file"/> |
626 |
- <mkdir dir="${base.path}"/> |
627 |
-@@ -2868,7 +2878,7 @@ |
628 |
- <delete file="${temp.file}.tar.gz"/> |
629 |
- </target> |
630 |
- |
631 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
632 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
633 |
- <!-- Download and extract the package from the two alternative locations --> |
634 |
- <local name="temp.file"/> |
635 |
- <mkdir dir="${base.path}"/> |
636 |
-@@ -2887,7 +2897,7 @@ |
637 |
- <delete file="${temp.file}.tar.gz"/> |
638 |
- </target> |
639 |
- |
640 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
641 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
642 |
- <!-- Download and extract the package --> |
643 |
- <local name="temp.file"/> |
644 |
- <mkdir dir="${base.path}"/> |
645 |
-@@ -2898,7 +2908,7 @@ |
646 |
- <delete file="${temp.file}"/> |
647 |
- </target> |
648 |
- |
649 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
650 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
651 |
- <!-- Download and extract the package from the two alternative locations --> |
652 |
- <local name="temp.file"/> |
653 |
- <mkdir dir="${base.path}"/> |
654 |
-@@ -2916,7 +2926,7 @@ |
655 |
- <delete file="${temp.file}"/> |
656 |
- </target> |
657 |
- |
658 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
659 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
660 |
- <!-- Download the file --> |
661 |
- <local name="temp.file"/> |
662 |
- <mkdir dir="${base.path}"/> |
663 |
-@@ -2926,7 +2936,7 @@ |
664 |
- <move file="${temp.file}" tofile="${destfile}"/> |
665 |
- </target> |
666 |
- |
667 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
668 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
669 |
- <!-- Download the file from the two alternative locations --> |
670 |
- <local name="temp.file"/> |
671 |
- <mkdir dir="${base.path}"/> |
672 |
-@@ -2949,7 +2959,7 @@ |
673 |
- <move file="${temp.file}" tofile="${destfile}"/> |
674 |
- </target> |
675 |
- |
676 |
-- <target name="trydownload.check" depends="setproxy"> |
677 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
678 |
- <condition property="trydownload.run"> |
679 |
- <and> |
680 |
- <not> |
681 |
-@@ -2960,7 +2970,7 @@ |
682 |
- </condition> |
683 |
- </target> |
684 |
- |
685 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
686 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
687 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
688 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
689 |
- </target> |
690 |
-@@ -2971,7 +2981,7 @@ |
691 |
- |
692 |
- <target name="ide-eclipse" |
693 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
694 |
-- description="Prepares the source tree to be built in Eclipse"> |
695 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
696 |
- |
697 |
- <!-- Copy the sample project files into the root directory --> |
698 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
699 |
|
700 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch |
701 |
deleted file mode 100644 |
702 |
index 1923d23..0000000 |
703 |
--- a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch |
704 |
+++ /dev/null |
705 |
@@ -1,265 +0,0 @@ |
706 |
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml |
707 |
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100 |
708 |
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100 |
709 |
-@@ -697,24 +697,29 @@ |
710 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
711 |
- |
712 |
- <!-- Servlet 3.1 Implementation JAR File --> |
713 |
-+<!-- |
714 |
- <jarIt jarfile="${servlet-api.jar}" |
715 |
- filesDir="${tomcat.classes}" |
716 |
- filesId="files.servlet-api" |
717 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
718 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
719 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
720 |
-- |
721 |
-+--> |
722 |
- <!-- JSP 2.3 Implementation JAR File --> |
723 |
-+<!-- |
724 |
- <jarIt jarfile="${jsp-api.jar}" |
725 |
- filesDir="${tomcat.classes}" |
726 |
- filesId="files.jsp-api" |
727 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
728 |
-+--> |
729 |
- |
730 |
- <!-- EL 3.0 Implementation JAR File --> |
731 |
-+<!-- |
732 |
- <jarIt jarfile="${el-api.jar}" |
733 |
- filesDir="${tomcat.classes}" |
734 |
- filesId="files.el-api" |
735 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
736 |
-+--> |
737 |
- |
738 |
- <!-- WebSocket 1.1 API JAR File --> |
739 |
- <jarIt jarfile="${websocket-api.jar}" |
740 |
-@@ -982,14 +987,14 @@ |
741 |
- |
742 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
743 |
- description="Default. Builds a working Tomcat instance"> |
744 |
-- |
745 |
-+<!-- |
746 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
747 |
- file="${tomcat-native.tar.gz}" /> |
748 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
749 |
- file="${commons-daemon.native.src.tgz}" /> |
750 |
- |
751 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
752 |
-- |
753 |
-+--> |
754 |
- <!-- Copy scripts --> |
755 |
- <copy todir="${tomcat.build}/bin"> |
756 |
- <fileset dir="bin"> |
757 |
-@@ -1049,7 +1054,7 @@ |
758 |
- <exclude name="${jdt.jar.filename}"/> |
759 |
- </fileset> |
760 |
- </delete> |
761 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
762 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
763 |
- |
764 |
- <!-- Add sources for examples --> |
765 |
- <antcall target="examples-sources" /> |
766 |
-@@ -1083,7 +1088,7 @@ |
767 |
- </javac> |
768 |
- </target> |
769 |
- |
770 |
-- <target name="build-tomcat-jdbc" depends="package"> |
771 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
772 |
- <!-- build the jdbc-pool jar and source jar--> |
773 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
774 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
775 |
-@@ -1098,7 +1103,7 @@ |
776 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
777 |
- </target> |
778 |
- |
779 |
-- <target name="build-tomcat-jdbc-src"> |
780 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
781 |
- <!-- build the jdbc-pool source jar--> |
782 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
783 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
784 |
-@@ -1202,10 +1207,11 @@ |
785 |
- |
786 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
787 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
788 |
-+<!-- |
789 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
790 |
- failonerror="false"/> |
791 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
792 |
-- |
793 |
-+--> |
794 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
795 |
- that needs to add entries. If there is more than one a more complex |
796 |
- solution will be required. --> |
797 |
-@@ -1542,7 +1548,7 @@ |
798 |
- |
799 |
- <target name="extras-commons-logging-prepare" |
800 |
- depends="extras-prepare" |
801 |
-- description="Prepare to build web services extras package"> |
802 |
-+ description="Prepare to build web services extras package" unless="noget"> |
803 |
- |
804 |
- <antcall target="downloadfile-2"> |
805 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
806 |
-@@ -1681,7 +1687,7 @@ |
807 |
- |
808 |
- <target name="extras-webservices-prepare" |
809 |
- depends="extras-prepare" |
810 |
-- description="Prepare to build web services extras package"> |
811 |
-+ description="Prepare to build web services extras package" unless="noget"> |
812 |
- |
813 |
- <antcall target="downloadfile"> |
814 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
815 |
-@@ -1882,6 +1888,7 @@ |
816 |
- |
817 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
818 |
- description="Create the Tomcat javadoc" > |
819 |
-+<!-- |
820 |
- <javadoc packagenames="javax.servlet.*" |
821 |
- excludepackagenames="javax.servlet.jsp.*" |
822 |
- sourcepath="${tomcat.dist}/src/java" |
823 |
-@@ -1940,6 +1947,7 @@ |
824 |
- <path location="${ant.core.lib}"/> |
825 |
- </classpath> |
826 |
- </javadoc> |
827 |
-+--> |
828 |
- <javadoc packagenames="javax.websocket.*" |
829 |
- sourcepath="${tomcat.dist}/src/java" |
830 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
831 |
-@@ -1970,15 +1978,17 @@ |
832 |
- docencoding="UTF-8" |
833 |
- charset="UTF-8" |
834 |
- additionalparam="-breakiterator -notimestamp" |
835 |
-- maxmemory="256m" > |
836 |
-+ maxmemory="512m" > |
837 |
- <classpath> |
838 |
- <path refid="compile.classpath"/> |
839 |
- <path refid="tomcat.webservices.classpath"/> |
840 |
- <path location="${ant.core.lib}"/> |
841 |
- </classpath> |
842 |
-+<!-- |
843 |
- <link href="../servletapi"/> |
844 |
- <link href="../jspapi"/> |
845 |
- <link href="../elapi"/> |
846 |
-+--> |
847 |
- <link href="../websocketapi"/> |
848 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
849 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
850 |
-@@ -2739,7 +2749,7 @@ |
851 |
- </target> |
852 |
- |
853 |
- <target name="download-compile" |
854 |
-- description="Download (and build) components necessary to compile" > |
855 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
856 |
- |
857 |
- <antcall target="downloadfile-2"> |
858 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
859 |
-@@ -2773,7 +2783,7 @@ |
860 |
- </target> |
861 |
- |
862 |
- <target name="download-test-compile" |
863 |
-- description="Download additional components for the tests" > |
864 |
-+ description="Download additional components for the tests" unless="noget"> |
865 |
- |
866 |
- <antcall target="downloadfile"> |
867 |
- <param name="sourcefile" value="${junit.loc}"/> |
868 |
-@@ -2819,7 +2829,7 @@ |
869 |
- </target> |
870 |
- |
871 |
- <target name="download-dist" |
872 |
-- description="Download additional components for a distribution" > |
873 |
-+ description="Download additional components for a distribution" unless="noget"> |
874 |
- |
875 |
- <antcall target="downloadzip-2"> |
876 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
877 |
-@@ -2845,18 +2855,18 @@ |
878 |
- |
879 |
- <!-- =============== Utility Targets to support downloads ================ --> |
880 |
- |
881 |
-- <target name="setproxy" if="${proxy.use}"> |
882 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
883 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
884 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
885 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
886 |
- </target> |
887 |
- |
888 |
-- <target name="testexist"> |
889 |
-+ <target name="testexist" unless="noget"> |
890 |
- <echo message="Testing for ${destfile}"/> |
891 |
- <available file="${destfile}" property="exist"/> |
892 |
- </target> |
893 |
- |
894 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
895 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
896 |
- <!-- Download and extract the package --> |
897 |
- <local name="temp.file"/> |
898 |
- <mkdir dir="${base.path}"/> |
899 |
-@@ -2868,7 +2878,7 @@ |
900 |
- <delete file="${temp.file}.tar.gz"/> |
901 |
- </target> |
902 |
- |
903 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
904 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
905 |
- <!-- Download and extract the package from the two alternative locations --> |
906 |
- <local name="temp.file"/> |
907 |
- <mkdir dir="${base.path}"/> |
908 |
-@@ -2887,7 +2897,7 @@ |
909 |
- <delete file="${temp.file}.tar.gz"/> |
910 |
- </target> |
911 |
- |
912 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
913 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
914 |
- <!-- Download and extract the package --> |
915 |
- <local name="temp.file"/> |
916 |
- <mkdir dir="${base.path}"/> |
917 |
-@@ -2898,7 +2908,7 @@ |
918 |
- <delete file="${temp.file}"/> |
919 |
- </target> |
920 |
- |
921 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
922 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
923 |
- <!-- Download and extract the package from the two alternative locations --> |
924 |
- <local name="temp.file"/> |
925 |
- <mkdir dir="${base.path}"/> |
926 |
-@@ -2916,7 +2926,7 @@ |
927 |
- <delete file="${temp.file}"/> |
928 |
- </target> |
929 |
- |
930 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
931 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
932 |
- <!-- Download the file --> |
933 |
- <local name="temp.file"/> |
934 |
- <mkdir dir="${base.path}"/> |
935 |
-@@ -2926,7 +2936,7 @@ |
936 |
- <move file="${temp.file}" tofile="${destfile}"/> |
937 |
- </target> |
938 |
- |
939 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
940 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
941 |
- <!-- Download the file from the two alternative locations --> |
942 |
- <local name="temp.file"/> |
943 |
- <mkdir dir="${base.path}"/> |
944 |
-@@ -2949,7 +2959,7 @@ |
945 |
- <move file="${temp.file}" tofile="${destfile}"/> |
946 |
- </target> |
947 |
- |
948 |
-- <target name="trydownload.check" depends="setproxy"> |
949 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
950 |
- <condition property="trydownload.run"> |
951 |
- <and> |
952 |
- <not> |
953 |
-@@ -2960,7 +2970,7 @@ |
954 |
- </condition> |
955 |
- </target> |
956 |
- |
957 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
958 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
959 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
960 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
961 |
- </target> |
962 |
-@@ -2971,7 +2981,7 @@ |
963 |
- |
964 |
- <target name="ide-eclipse" |
965 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
966 |
-- description="Prepares the source tree to be built in Eclipse"> |
967 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
968 |
- |
969 |
- <!-- Copy the sample project files into the root directory --> |
970 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
971 |
|
972 |
diff --git a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild |
973 |
deleted file mode 100644 |
974 |
index 7636497..0000000 |
975 |
--- a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild |
976 |
+++ /dev/null |
977 |
@@ -1,145 +0,0 @@ |
978 |
-# Copyright 1999-2015 Gentoo Foundation |
979 |
-# Distributed under the terms of the GNU General Public License v2 |
980 |
-# $Id$ |
981 |
- |
982 |
-EAPI="5" |
983 |
- |
984 |
-JAVA_PKG_IUSE="doc source test" |
985 |
- |
986 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
987 |
- |
988 |
-MY_P="apache-${P}-src" |
989 |
- |
990 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container" |
991 |
-HOMEPAGE="http://tomcat.apache.org/" |
992 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
993 |
- |
994 |
-LICENSE="Apache-2.0" |
995 |
-SLOT="8" |
996 |
-KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
997 |
-IUSE="extra-webapps" |
998 |
- |
999 |
-RESTRICT="test" # can we run them on a production system? |
1000 |
- |
1001 |
-ECJ_SLOT="4.4" |
1002 |
-SAPI_SLOT="3.1" |
1003 |
- |
1004 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1005 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
1006 |
-RDEPEND="${COMMON_DEP} |
1007 |
- !<dev-java/tomcat-native-1.1.24 |
1008 |
- >=virtual/jre-1.7" |
1009 |
-DEPEND="${COMMON_DEP} |
1010 |
- >=virtual/jdk-1.7 |
1011 |
- >=dev-java/ant-core-1.8.1:0 |
1012 |
- test? ( |
1013 |
- dev-java/ant-junit:0 |
1014 |
- dev-java/junit:4 |
1015 |
- )" |
1016 |
- |
1017 |
-S=${WORKDIR}/${MY_P} |
1018 |
- |
1019 |
-pkg_setup() { |
1020 |
- java-pkg-2_pkg_setup |
1021 |
- enewgroup tomcat 265 |
1022 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1023 |
-} |
1024 |
- |
1025 |
-java_prepare() { |
1026 |
- find -name '*.jar' -type f -delete -print || die |
1027 |
- |
1028 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1029 |
- |
1030 |
- # For use of catalina.sh in netbeans |
1031 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1032 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1033 |
- bin/catalina.sh || die |
1034 |
-} |
1035 |
- |
1036 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1037 |
- |
1038 |
-EANT_BUILD_TARGET="deploy" |
1039 |
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" |
1040 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1041 |
-EANT_NEEDS_TOOLS="true" |
1042 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1043 |
- |
1044 |
-# revision of the instance-manager script |
1045 |
-IM_REV="-r1" |
1046 |
- |
1047 |
-src_compile() { |
1048 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1049 |
- java-pkg-2_src_compile |
1050 |
-} |
1051 |
- |
1052 |
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" |
1053 |
- |
1054 |
-src_test() { |
1055 |
- java-pkg-2_src_test |
1056 |
-} |
1057 |
- |
1058 |
-src_install() { |
1059 |
- local dest="/usr/share/${PN}-${SLOT}" |
1060 |
- |
1061 |
- java-pkg_jarinto "${dest}"/bin |
1062 |
- java-pkg_dojar output/build/bin/*.jar |
1063 |
- exeinto "${dest}"/bin |
1064 |
- doexe output/build/bin/*.sh |
1065 |
- |
1066 |
- java-pkg_jarinto "${dest}"/lib |
1067 |
- java-pkg_dojar output/build/lib/*.jar |
1068 |
- |
1069 |
- # so we don't have to call java-config with --with-dependencies, which might |
1070 |
- # bring in more jars then actually desired. |
1071 |
- java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" |
1072 |
- |
1073 |
- dodoc RELEASE-NOTES RUNNING.txt |
1074 |
- use doc && java-pkg_dohtml -r output/dist/webapps/docs/api |
1075 |
- use source && java-pkg_dosrc java/* |
1076 |
- |
1077 |
- ### Webapps ### |
1078 |
- |
1079 |
- insinto "${dest}"/webapps |
1080 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1081 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1082 |
- |
1083 |
- ### Config ### |
1084 |
- |
1085 |
- # create "logs" directory in $CATALINA_BASE |
1086 |
- # and set correct perms, see #458890 |
1087 |
- dodir "${dest}"/logs |
1088 |
- fperms 0750 "${dest}"/logs |
1089 |
- |
1090 |
- # replace the default pw with a random one, see #92281 |
1091 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
1092 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1093 |
- |
1094 |
- insinto "${dest}" |
1095 |
- doins -r output/build/conf |
1096 |
- |
1097 |
- ### rc ### |
1098 |
- |
1099 |
- cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1100 |
- eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} |
1101 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die |
1102 |
- |
1103 |
- insinto "${dest}"/gentoo |
1104 |
- doins "${T}"/tomcat.conf |
1105 |
- exeinto "${dest}"/gentoo |
1106 |
- doexe "${T}"/tomcat.init |
1107 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1108 |
-} |
1109 |
- |
1110 |
-pkg_postinst() { |
1111 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1112 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1113 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1114 |
- |
1115 |
- elog "To manage Tomcat instances, run:" |
1116 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1117 |
- |
1118 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1119 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1120 |
- |
1121 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1122 |
-} |
1123 |
|
1124 |
diff --git a/www-servers/tomcat/tomcat-8.0.27.ebuild b/www-servers/tomcat/tomcat-8.0.27.ebuild |
1125 |
deleted file mode 100644 |
1126 |
index 3074dfa..0000000 |
1127 |
--- a/www-servers/tomcat/tomcat-8.0.27.ebuild |
1128 |
+++ /dev/null |
1129 |
@@ -1,147 +0,0 @@ |
1130 |
-# Copyright 1999-2015 Gentoo Foundation |
1131 |
-# Distributed under the terms of the GNU General Public License v2 |
1132 |
-# $Id$ |
1133 |
- |
1134 |
-EAPI=5 |
1135 |
- |
1136 |
-JAVA_PKG_IUSE="doc source test" |
1137 |
- |
1138 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
1139 |
- |
1140 |
-MY_P="apache-${P}-src" |
1141 |
- |
1142 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container" |
1143 |
-HOMEPAGE="http://tomcat.apache.org/" |
1144 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
1145 |
- |
1146 |
-LICENSE="Apache-2.0" |
1147 |
-SLOT="8" |
1148 |
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
1149 |
-IUSE="extra-webapps" |
1150 |
- |
1151 |
-RESTRICT="test" # can we run them on a production system? |
1152 |
- |
1153 |
-ECJ_SLOT="4.4" |
1154 |
-SAPI_SLOT="3.1" |
1155 |
- |
1156 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1157 |
- dev-java/oracle-javamail:0 |
1158 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
1159 |
-RDEPEND="${COMMON_DEP} |
1160 |
- !<dev-java/tomcat-native-1.1.24 |
1161 |
- >=virtual/jre-1.7" |
1162 |
-DEPEND="${COMMON_DEP} |
1163 |
- >=virtual/jdk-1.7 |
1164 |
- test? ( |
1165 |
- >=dev-java/ant-junit-1.9:0 |
1166 |
- dev-java/easymock:3.2 |
1167 |
- )" |
1168 |
- |
1169 |
-S=${WORKDIR}/${MY_P} |
1170 |
- |
1171 |
-pkg_setup() { |
1172 |
- java-pkg-2_pkg_setup |
1173 |
- enewgroup tomcat 265 |
1174 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1175 |
-} |
1176 |
- |
1177 |
-java_prepare() { |
1178 |
- find -name '*.jar' -type f -delete -print || die |
1179 |
- |
1180 |
- # Remove bundled javamail, servlet-api |
1181 |
- rm -rv java/javax/{el,mail,servlet} || die |
1182 |
- |
1183 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1184 |
- |
1185 |
- # For use of catalina.sh in netbeans |
1186 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1187 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1188 |
- bin/catalina.sh || die |
1189 |
-} |
1190 |
- |
1191 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1192 |
- |
1193 |
-EANT_BUILD_TARGET="deploy" |
1194 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" |
1195 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
1196 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1197 |
-EANT_NEEDS_TOOLS="true" |
1198 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1199 |
- |
1200 |
-# revisions of the scripts |
1201 |
-IM_REV="-r1" |
1202 |
-INIT_REV="-r1" |
1203 |
- |
1204 |
-src_compile() { |
1205 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1206 |
- java-pkg-2_src_compile |
1207 |
-} |
1208 |
- |
1209 |
-src_test() { |
1210 |
- java-pkg-2_src_test |
1211 |
-} |
1212 |
- |
1213 |
-src_install() { |
1214 |
- local dest="/usr/share/${PN}-${SLOT}" |
1215 |
- |
1216 |
- java-pkg_jarinto "${dest}"/bin |
1217 |
- java-pkg_dojar output/build/bin/*.jar |
1218 |
- exeinto "${dest}"/bin |
1219 |
- doexe output/build/bin/*.sh |
1220 |
- |
1221 |
- java-pkg_jarinto "${dest}"/lib |
1222 |
- java-pkg_dojar output/build/lib/*.jar |
1223 |
- |
1224 |
- dodoc RELEASE-NOTES RUNNING.txt |
1225 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1226 |
- use source && java-pkg_dosrc java/* |
1227 |
- |
1228 |
- ### Webapps ### |
1229 |
- |
1230 |
- insinto "${dest}"/webapps |
1231 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1232 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1233 |
- |
1234 |
- ### Config ### |
1235 |
- |
1236 |
- # create "logs" directory in $CATALINA_BASE |
1237 |
- # and set correct perms, see #458890 |
1238 |
- dodir "${dest}"/logs |
1239 |
- fperms 0750 "${dest}"/logs |
1240 |
- |
1241 |
- # replace the default pw with a random one, see #92281 |
1242 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
1243 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1244 |
- |
1245 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1246 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1247 |
- |
1248 |
- insinto "${dest}" |
1249 |
- doins -r output/build/conf |
1250 |
- |
1251 |
- ### rc ### |
1252 |
- |
1253 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1254 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1255 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1256 |
- |
1257 |
- insinto "${dest}"/gentoo |
1258 |
- doins "${T}"/tomcat.conf |
1259 |
- exeinto "${dest}"/gentoo |
1260 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1261 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1262 |
-} |
1263 |
- |
1264 |
-pkg_postinst() { |
1265 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1266 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1267 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1268 |
- |
1269 |
- elog "To manage Tomcat instances, run:" |
1270 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1271 |
- |
1272 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1273 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1274 |
- |
1275 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1276 |
-} |
1277 |
|
1278 |
diff --git a/www-servers/tomcat/tomcat-8.0.28.ebuild b/www-servers/tomcat/tomcat-8.0.28.ebuild |
1279 |
deleted file mode 100644 |
1280 |
index 3074dfa..0000000 |
1281 |
--- a/www-servers/tomcat/tomcat-8.0.28.ebuild |
1282 |
+++ /dev/null |
1283 |
@@ -1,147 +0,0 @@ |
1284 |
-# Copyright 1999-2015 Gentoo Foundation |
1285 |
-# Distributed under the terms of the GNU General Public License v2 |
1286 |
-# $Id$ |
1287 |
- |
1288 |
-EAPI=5 |
1289 |
- |
1290 |
-JAVA_PKG_IUSE="doc source test" |
1291 |
- |
1292 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
1293 |
- |
1294 |
-MY_P="apache-${P}-src" |
1295 |
- |
1296 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container" |
1297 |
-HOMEPAGE="http://tomcat.apache.org/" |
1298 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
1299 |
- |
1300 |
-LICENSE="Apache-2.0" |
1301 |
-SLOT="8" |
1302 |
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
1303 |
-IUSE="extra-webapps" |
1304 |
- |
1305 |
-RESTRICT="test" # can we run them on a production system? |
1306 |
- |
1307 |
-ECJ_SLOT="4.4" |
1308 |
-SAPI_SLOT="3.1" |
1309 |
- |
1310 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1311 |
- dev-java/oracle-javamail:0 |
1312 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
1313 |
-RDEPEND="${COMMON_DEP} |
1314 |
- !<dev-java/tomcat-native-1.1.24 |
1315 |
- >=virtual/jre-1.7" |
1316 |
-DEPEND="${COMMON_DEP} |
1317 |
- >=virtual/jdk-1.7 |
1318 |
- test? ( |
1319 |
- >=dev-java/ant-junit-1.9:0 |
1320 |
- dev-java/easymock:3.2 |
1321 |
- )" |
1322 |
- |
1323 |
-S=${WORKDIR}/${MY_P} |
1324 |
- |
1325 |
-pkg_setup() { |
1326 |
- java-pkg-2_pkg_setup |
1327 |
- enewgroup tomcat 265 |
1328 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1329 |
-} |
1330 |
- |
1331 |
-java_prepare() { |
1332 |
- find -name '*.jar' -type f -delete -print || die |
1333 |
- |
1334 |
- # Remove bundled javamail, servlet-api |
1335 |
- rm -rv java/javax/{el,mail,servlet} || die |
1336 |
- |
1337 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1338 |
- |
1339 |
- # For use of catalina.sh in netbeans |
1340 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1341 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1342 |
- bin/catalina.sh || die |
1343 |
-} |
1344 |
- |
1345 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1346 |
- |
1347 |
-EANT_BUILD_TARGET="deploy" |
1348 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" |
1349 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
1350 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1351 |
-EANT_NEEDS_TOOLS="true" |
1352 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1353 |
- |
1354 |
-# revisions of the scripts |
1355 |
-IM_REV="-r1" |
1356 |
-INIT_REV="-r1" |
1357 |
- |
1358 |
-src_compile() { |
1359 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1360 |
- java-pkg-2_src_compile |
1361 |
-} |
1362 |
- |
1363 |
-src_test() { |
1364 |
- java-pkg-2_src_test |
1365 |
-} |
1366 |
- |
1367 |
-src_install() { |
1368 |
- local dest="/usr/share/${PN}-${SLOT}" |
1369 |
- |
1370 |
- java-pkg_jarinto "${dest}"/bin |
1371 |
- java-pkg_dojar output/build/bin/*.jar |
1372 |
- exeinto "${dest}"/bin |
1373 |
- doexe output/build/bin/*.sh |
1374 |
- |
1375 |
- java-pkg_jarinto "${dest}"/lib |
1376 |
- java-pkg_dojar output/build/lib/*.jar |
1377 |
- |
1378 |
- dodoc RELEASE-NOTES RUNNING.txt |
1379 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1380 |
- use source && java-pkg_dosrc java/* |
1381 |
- |
1382 |
- ### Webapps ### |
1383 |
- |
1384 |
- insinto "${dest}"/webapps |
1385 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1386 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1387 |
- |
1388 |
- ### Config ### |
1389 |
- |
1390 |
- # create "logs" directory in $CATALINA_BASE |
1391 |
- # and set correct perms, see #458890 |
1392 |
- dodir "${dest}"/logs |
1393 |
- fperms 0750 "${dest}"/logs |
1394 |
- |
1395 |
- # replace the default pw with a random one, see #92281 |
1396 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
1397 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1398 |
- |
1399 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1400 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1401 |
- |
1402 |
- insinto "${dest}" |
1403 |
- doins -r output/build/conf |
1404 |
- |
1405 |
- ### rc ### |
1406 |
- |
1407 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1408 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1409 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1410 |
- |
1411 |
- insinto "${dest}"/gentoo |
1412 |
- doins "${T}"/tomcat.conf |
1413 |
- exeinto "${dest}"/gentoo |
1414 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1415 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1416 |
-} |
1417 |
- |
1418 |
-pkg_postinst() { |
1419 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1420 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1421 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1422 |
- |
1423 |
- elog "To manage Tomcat instances, run:" |
1424 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1425 |
- |
1426 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1427 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1428 |
- |
1429 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1430 |
-} |