1 |
commit: 6254bf28831cb4b0888988099fb1b27821163f24 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 16 08:42:35 2017 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 16 08:54:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6254bf28 |
7 |
|
8 |
www-servers/tomcat: removed older version, dropping x86 on slot 7 and 8 to ~x86 |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
www-servers/tomcat/Manifest | 4 - |
13 |
.../tomcat/files/tomcat-7.0.81-build.xml.patch | 149 ------------ |
14 |
.../tomcat/files/tomcat-8.0.45-build.xml.patch | 259 --------------------- |
15 |
.../tomcat/files/tomcat-8.0.46-build.xml.patch | 259 --------------------- |
16 |
.../tomcat/files/tomcat-8.5.20-build.xml.patch | 250 -------------------- |
17 |
www-servers/tomcat/tomcat-7.0.81.ebuild | 148 ------------ |
18 |
www-servers/tomcat/tomcat-8.0.45.ebuild | 157 ------------- |
19 |
www-servers/tomcat/tomcat-8.0.46.ebuild | 157 ------------- |
20 |
www-servers/tomcat/tomcat-8.5.20.ebuild | 157 ------------- |
21 |
9 files changed, 1540 deletions(-) |
22 |
|
23 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
24 |
index f53fd96b2d5..73ab7d6d336 100644 |
25 |
--- a/www-servers/tomcat/Manifest |
26 |
+++ b/www-servers/tomcat/Manifest |
27 |
@@ -1,8 +1,4 @@ |
28 |
-DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487 |
29 |
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db WHIRLPOOL aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1 |
30 |
-DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0 |
31 |
-DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9 |
32 |
DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8 |
33 |
-DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895 |
34 |
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64 |
35 |
DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66 |
36 |
|
37 |
diff --git a/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch |
38 |
deleted file mode 100644 |
39 |
index 481591fb6ff..00000000000 |
40 |
--- a/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch |
41 |
+++ /dev/null |
42 |
@@ -1,149 +0,0 @@ |
43 |
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml |
44 |
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 |
45 |
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 |
46 |
-@@ -660,12 +660,14 @@ |
47 |
- </fileset> |
48 |
- </copy> |
49 |
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> |
50 |
-+<!-- |
51 |
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> |
52 |
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> |
53 |
- <include name="*" /> |
54 |
- <exclude name="jspxml*" /> |
55 |
- </fileset> |
56 |
- </copy> |
57 |
-+--> |
58 |
- |
59 |
- </target> |
60 |
- |
61 |
-@@ -721,26 +723,32 @@ |
62 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
63 |
- |
64 |
- <!-- Servlet 3.0 Implementation JAR File --> |
65 |
-+<!-- |
66 |
- <jarIt jarfile="${servlet-api.jar}" |
67 |
- filesDir="${tomcat.classes}" |
68 |
- filesId="files.servlet-api" |
69 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
70 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
71 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
72 |
-+--> |
73 |
- |
74 |
- <!-- JSP 2.2 Implementation JAR File --> |
75 |
-+<!-- |
76 |
- <jarIt jarfile="${jsp-api.jar}" |
77 |
- filesDir="${tomcat.classes}" |
78 |
- filesId="files.jsp-api" |
79 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
80 |
- notice="${tomcat.manifests}/jsp-api.jar.notice" |
81 |
- license="${tomcat.manifests}/jsp-api.jar.license" /> |
82 |
-+--> |
83 |
- |
84 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
85 |
-+<!-- |
86 |
- <jarIt jarfile="${el-api.jar}" |
87 |
- filesDir="${tomcat.classes}" |
88 |
- filesId="files.el-api" |
89 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
90 |
-+--> |
91 |
- |
92 |
- <!-- Bootstrap JAR File --> |
93 |
- <jarIt jarfile="${bootstrap.jar}" |
94 |
-@@ -986,12 +994,14 @@ |
95 |
- <target name="deploy" depends="package,build-docs,compile-webapp-examples" |
96 |
- description="Default. Builds a working Tomcat instance"> |
97 |
- |
98 |
-+<!-- |
99 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
100 |
- file="${tomcat-native.tar.gz}" /> |
101 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
102 |
- file="${commons-daemon.native.src.tgz}" /> |
103 |
- |
104 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
105 |
-+--> |
106 |
- |
107 |
- <!-- Copy scripts --> |
108 |
- <copy todir="${tomcat.build}/bin"> |
109 |
-@@ -1051,14 +1061,15 @@ |
110 |
- <exclude name="${jdt.jar.filename}"/> |
111 |
- </fileset> |
112 |
- </delete> |
113 |
-+<!-- |
114 |
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
115 |
-- |
116 |
-+--> |
117 |
- <!-- Add sources for examples --> |
118 |
- <antcall target="examples-sources" /> |
119 |
-- |
120 |
-+<!-- |
121 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
122 |
- failonerror="false"/> |
123 |
-- |
124 |
-+--> |
125 |
- <!-- build the jdbc-pool jar and source jar--> |
126 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
127 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
128 |
-@@ -1681,7 +1692,7 @@ |
129 |
- |
130 |
- <target name="extras-webservices-prepare" |
131 |
- depends="extras-prepare" |
132 |
-- description="Prepare to build web services extras package"> |
133 |
-+ description="Prepare to build web services extras package" unless="noget"> |
134 |
- |
135 |
- <antcall target="downloadfile"> |
136 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
137 |
-@@ -1886,6 +1897,7 @@ |
138 |
- description="Create the Tomcat javadoc" > |
139 |
- <fail unless="java.7.home" |
140 |
- message="The java.7.home property must be set for javadoc build"/> |
141 |
-+<!-- |
142 |
- <javadoc packagenames="javax.servlet.*" |
143 |
- excludepackagenames="javax.servlet.jsp.*" |
144 |
- sourcepath="${tomcat.dist}/src/java" |
145 |
-@@ -1947,6 +1959,7 @@ |
146 |
- <path location="${ant.core.lib}"/> |
147 |
- </classpath> |
148 |
- </javadoc> |
149 |
-+--> |
150 |
- <javadoc packagenames="javax.websocket.*" |
151 |
- sourcepath="${tomcat.dist}/src/java" |
152 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
153 |
-@@ -1985,9 +1998,11 @@ |
154 |
- <path refid="tomcat.webservices.classpath"/> |
155 |
- <path location="${ant.core.lib}"/> |
156 |
- </classpath> |
157 |
-+<!-- |
158 |
- <link href="../servletapi"/> |
159 |
- <link href="../jspapi"/> |
160 |
- <link href="../elapi"/> |
161 |
-+--> |
162 |
- <link href="../websocketapi"/> |
163 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
164 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
165 |
-@@ -2642,7 +2657,7 @@ |
166 |
- </target> |
167 |
- |
168 |
- <target name="download-compile" |
169 |
-- description="Download (and build) components necessary to compile" > |
170 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
171 |
- |
172 |
- <antcall target="downloadfile-2"> |
173 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
174 |
-@@ -2699,7 +2714,7 @@ |
175 |
- </target> |
176 |
- |
177 |
- <target name="download-test-compile" |
178 |
-- description="Download additional components for the tests" > |
179 |
-+ description="Download additional components for the tests" unless="noget"> |
180 |
- |
181 |
- <antcall target="downloadfile"> |
182 |
- <param name="sourcefile" value="${junit.loc}"/> |
183 |
-@@ -2727,7 +2742,7 @@ |
184 |
- </target> |
185 |
- |
186 |
- <target name="download-dist" |
187 |
-- description="Download additional components for a distribution" > |
188 |
-+ description="Download additional components for a distribution" unless="noget"> |
189 |
- |
190 |
- <antcall target="downloadzip-2"> |
191 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
192 |
|
193 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch |
194 |
deleted file mode 100644 |
195 |
index cefd59f55ae..00000000000 |
196 |
--- a/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch |
197 |
+++ /dev/null |
198 |
@@ -1,259 +0,0 @@ |
199 |
-diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml |
200 |
-index 1ba0dae..81a0a2c 100644 |
201 |
---- a/apache-tomcat-8.0.36-src/build.xml |
202 |
-+++ b/apache-tomcat-8.0.36-src/build.xml |
203 |
-@@ -701,24 +701,29 @@ |
204 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
205 |
- |
206 |
- <!-- Servlet 3.1 Implementation JAR File --> |
207 |
-+<!-- |
208 |
- <jarIt jarfile="${servlet-api.jar}" |
209 |
- filesDir="${tomcat.classes}" |
210 |
- filesId="files.servlet-api" |
211 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
212 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
213 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
214 |
-- |
215 |
-+--> |
216 |
- <!-- JSP 2.3 Implementation JAR File --> |
217 |
-+<!-- |
218 |
- <jarIt jarfile="${jsp-api.jar}" |
219 |
- filesDir="${tomcat.classes}" |
220 |
- filesId="files.jsp-api" |
221 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
222 |
-+--> |
223 |
- |
224 |
- <!-- EL 3.0 Implementation JAR File --> |
225 |
-+<!-- |
226 |
- <jarIt jarfile="${el-api.jar}" |
227 |
- filesDir="${tomcat.classes}" |
228 |
- filesId="files.el-api" |
229 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
230 |
-+--> |
231 |
- |
232 |
- <!-- WebSocket 1.1 API JAR File --> |
233 |
- <jarIt jarfile="${websocket-api.jar}" |
234 |
-@@ -986,14 +991,14 @@ |
235 |
- |
236 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
237 |
- description="Default. Builds a working Tomcat instance"> |
238 |
-- |
239 |
-+<!-- |
240 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
241 |
- file="${tomcat-native.tar.gz}" /> |
242 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
243 |
- file="${commons-daemon.native.src.tgz}" /> |
244 |
- |
245 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
246 |
-- |
247 |
-+--> |
248 |
- <!-- Copy scripts --> |
249 |
- <copy todir="${tomcat.build}/bin"> |
250 |
- <fileset dir="bin"> |
251 |
-@@ -1053,7 +1058,7 @@ |
252 |
- <exclude name="${jdt.jar.filename}"/> |
253 |
- </fileset> |
254 |
- </delete> |
255 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
256 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
257 |
- |
258 |
- <!-- Add sources for examples --> |
259 |
- <antcall target="examples-sources" /> |
260 |
-@@ -1087,7 +1092,7 @@ |
261 |
- </javac> |
262 |
- </target> |
263 |
- |
264 |
-- <target name="build-tomcat-jdbc" depends="package"> |
265 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
266 |
- <!-- build the jdbc-pool jar and source jar--> |
267 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
268 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
269 |
-@@ -1102,7 +1107,7 @@ |
270 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
271 |
- </target> |
272 |
- |
273 |
-- <target name="build-tomcat-jdbc-src"> |
274 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
275 |
- <!-- build the jdbc-pool source jar--> |
276 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
277 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
278 |
-@@ -1206,10 +1211,11 @@ |
279 |
- |
280 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
281 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
282 |
-+<!-- |
283 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
284 |
- failonerror="false"/> |
285 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
286 |
-- |
287 |
-+--> |
288 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
289 |
- that needs to add entries. If there is more than one a more complex |
290 |
- solution will be required. --> |
291 |
-@@ -1594,7 +1600,7 @@ |
292 |
- |
293 |
- <target name="extras-commons-logging-prepare" |
294 |
- depends="extras-prepare" |
295 |
-- description="Prepare to build web services extras package"> |
296 |
-+ description="Prepare to build web services extras package" unless="noget"> |
297 |
- |
298 |
- <antcall target="downloadfile-2"> |
299 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
300 |
-@@ -1733,7 +1739,7 @@ |
301 |
- |
302 |
- <target name="extras-webservices-prepare" |
303 |
- depends="extras-prepare" |
304 |
-- description="Prepare to build web services extras package"> |
305 |
-+ description="Prepare to build web services extras package" unless="noget"> |
306 |
- |
307 |
- <antcall target="downloadfile"> |
308 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
309 |
-@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
310 |
- |
311 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
312 |
- description="Create the Tomcat javadoc" > |
313 |
-+<!-- |
314 |
- <javadoc packagenames="javax.servlet.*" |
315 |
- excludepackagenames="javax.servlet.jsp.*" |
316 |
- sourcepath="${tomcat.dist}/src/java" |
317 |
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
318 |
- <path location="${ant.core.lib}"/> |
319 |
- </classpath> |
320 |
- </javadoc> |
321 |
-+--> |
322 |
- <javadoc packagenames="javax.websocket.*" |
323 |
- sourcepath="${tomcat.dist}/src/java" |
324 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
325 |
-@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
326 |
- <path refid="tomcat.webservices.classpath"/> |
327 |
- <path location="${ant.core.lib}"/> |
328 |
- </classpath> |
329 |
-+<!-- |
330 |
- <link href="../servletapi"/> |
331 |
- <link href="../jspapi"/> |
332 |
- <link href="../elapi"/> |
333 |
-+--> |
334 |
- <link href="../websocketapi"/> |
335 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
336 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
337 |
-@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> |
338 |
- </target> |
339 |
- |
340 |
- <target name="download-compile" |
341 |
-- description="Download (and build) components necessary to compile" > |
342 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
343 |
- |
344 |
- <antcall target="downloadfile-2"> |
345 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
346 |
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> |
347 |
- </target> |
348 |
- |
349 |
- <target name="download-test-compile" |
350 |
-- description="Download additional components for the tests" > |
351 |
-+ description="Download additional components for the tests" unless="noget"> |
352 |
- |
353 |
- <antcall target="downloadfile"> |
354 |
- <param name="sourcefile" value="${junit.loc}"/> |
355 |
-@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> |
356 |
- </target> |
357 |
- |
358 |
- <target name="download-dist" |
359 |
-- description="Download additional components for a distribution" > |
360 |
-+ description="Download additional components for a distribution" unless="noget"> |
361 |
- |
362 |
- <antcall target="downloadzip-2"> |
363 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
364 |
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> |
365 |
- |
366 |
- <!-- =============== Utility Targets to support downloads ================ --> |
367 |
- |
368 |
-- <target name="setproxy" if="${proxy.use}"> |
369 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
370 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
371 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
372 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
373 |
- </target> |
374 |
- |
375 |
-- <target name="testexist"> |
376 |
-+ <target name="testexist" unless="noget"> |
377 |
- <echo message="Testing for ${destfile}"/> |
378 |
- <available file="${destfile}" property="exist"/> |
379 |
- </target> |
380 |
- |
381 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
382 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
383 |
- <!-- Download and extract the package --> |
384 |
- <local name="temp.file"/> |
385 |
- <mkdir dir="${base.path}"/> |
386 |
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> |
387 |
- <delete file="${temp.file}.tar.gz"/> |
388 |
- </target> |
389 |
- |
390 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
391 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
392 |
- <!-- Download and extract the package from the two alternative locations --> |
393 |
- <local name="temp.file"/> |
394 |
- <mkdir dir="${base.path}"/> |
395 |
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> |
396 |
- <delete file="${temp.file}.tar.gz"/> |
397 |
- </target> |
398 |
- |
399 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
400 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
401 |
- <!-- Download and extract the package --> |
402 |
- <local name="temp.file"/> |
403 |
- <mkdir dir="${base.path}"/> |
404 |
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> |
405 |
- <delete file="${temp.file}"/> |
406 |
- </target> |
407 |
- |
408 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
409 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
410 |
- <!-- Download and extract the package from the two alternative locations --> |
411 |
- <local name="temp.file"/> |
412 |
- <mkdir dir="${base.path}"/> |
413 |
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> |
414 |
- <delete file="${temp.file}"/> |
415 |
- </target> |
416 |
- |
417 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
418 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
419 |
- <!-- Download the file --> |
420 |
- <local name="temp.file"/> |
421 |
- <mkdir dir="${base.path}"/> |
422 |
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> |
423 |
- <move file="${temp.file}" tofile="${destfile}"/> |
424 |
- </target> |
425 |
- |
426 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
427 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
428 |
- <!-- Download the file from the two alternative locations --> |
429 |
- <local name="temp.file"/> |
430 |
- <mkdir dir="${base.path}"/> |
431 |
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> |
432 |
- <move file="${temp.file}" tofile="${destfile}"/> |
433 |
- </target> |
434 |
- |
435 |
-- <target name="trydownload.check" depends="setproxy"> |
436 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
437 |
- <condition property="trydownload.run"> |
438 |
- <and> |
439 |
- <not> |
440 |
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> |
441 |
- </condition> |
442 |
- </target> |
443 |
- |
444 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
445 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
446 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
447 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
448 |
- </target> |
449 |
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> |
450 |
- |
451 |
- <target name="ide-eclipse" |
452 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
453 |
-- description="Prepares the source tree to be built in Eclipse"> |
454 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
455 |
- |
456 |
- <!-- Copy the sample project files into the root directory --> |
457 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
458 |
|
459 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch |
460 |
deleted file mode 100644 |
461 |
index cefd59f55ae..00000000000 |
462 |
--- a/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch |
463 |
+++ /dev/null |
464 |
@@ -1,259 +0,0 @@ |
465 |
-diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml |
466 |
-index 1ba0dae..81a0a2c 100644 |
467 |
---- a/apache-tomcat-8.0.36-src/build.xml |
468 |
-+++ b/apache-tomcat-8.0.36-src/build.xml |
469 |
-@@ -701,24 +701,29 @@ |
470 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
471 |
- |
472 |
- <!-- Servlet 3.1 Implementation JAR File --> |
473 |
-+<!-- |
474 |
- <jarIt jarfile="${servlet-api.jar}" |
475 |
- filesDir="${tomcat.classes}" |
476 |
- filesId="files.servlet-api" |
477 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
478 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
479 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
480 |
-- |
481 |
-+--> |
482 |
- <!-- JSP 2.3 Implementation JAR File --> |
483 |
-+<!-- |
484 |
- <jarIt jarfile="${jsp-api.jar}" |
485 |
- filesDir="${tomcat.classes}" |
486 |
- filesId="files.jsp-api" |
487 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
488 |
-+--> |
489 |
- |
490 |
- <!-- EL 3.0 Implementation JAR File --> |
491 |
-+<!-- |
492 |
- <jarIt jarfile="${el-api.jar}" |
493 |
- filesDir="${tomcat.classes}" |
494 |
- filesId="files.el-api" |
495 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
496 |
-+--> |
497 |
- |
498 |
- <!-- WebSocket 1.1 API JAR File --> |
499 |
- <jarIt jarfile="${websocket-api.jar}" |
500 |
-@@ -986,14 +991,14 @@ |
501 |
- |
502 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
503 |
- description="Default. Builds a working Tomcat instance"> |
504 |
-- |
505 |
-+<!-- |
506 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
507 |
- file="${tomcat-native.tar.gz}" /> |
508 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
509 |
- file="${commons-daemon.native.src.tgz}" /> |
510 |
- |
511 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
512 |
-- |
513 |
-+--> |
514 |
- <!-- Copy scripts --> |
515 |
- <copy todir="${tomcat.build}/bin"> |
516 |
- <fileset dir="bin"> |
517 |
-@@ -1053,7 +1058,7 @@ |
518 |
- <exclude name="${jdt.jar.filename}"/> |
519 |
- </fileset> |
520 |
- </delete> |
521 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
522 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
523 |
- |
524 |
- <!-- Add sources for examples --> |
525 |
- <antcall target="examples-sources" /> |
526 |
-@@ -1087,7 +1092,7 @@ |
527 |
- </javac> |
528 |
- </target> |
529 |
- |
530 |
-- <target name="build-tomcat-jdbc" depends="package"> |
531 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
532 |
- <!-- build the jdbc-pool jar and source jar--> |
533 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
534 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
535 |
-@@ -1102,7 +1107,7 @@ |
536 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
537 |
- </target> |
538 |
- |
539 |
-- <target name="build-tomcat-jdbc-src"> |
540 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
541 |
- <!-- build the jdbc-pool source jar--> |
542 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
543 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
544 |
-@@ -1206,10 +1211,11 @@ |
545 |
- |
546 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
547 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
548 |
-+<!-- |
549 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
550 |
- failonerror="false"/> |
551 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
552 |
-- |
553 |
-+--> |
554 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
555 |
- that needs to add entries. If there is more than one a more complex |
556 |
- solution will be required. --> |
557 |
-@@ -1594,7 +1600,7 @@ |
558 |
- |
559 |
- <target name="extras-commons-logging-prepare" |
560 |
- depends="extras-prepare" |
561 |
-- description="Prepare to build web services extras package"> |
562 |
-+ description="Prepare to build web services extras package" unless="noget"> |
563 |
- |
564 |
- <antcall target="downloadfile-2"> |
565 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
566 |
-@@ -1733,7 +1739,7 @@ |
567 |
- |
568 |
- <target name="extras-webservices-prepare" |
569 |
- depends="extras-prepare" |
570 |
-- description="Prepare to build web services extras package"> |
571 |
-+ description="Prepare to build web services extras package" unless="noget"> |
572 |
- |
573 |
- <antcall target="downloadfile"> |
574 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
575 |
-@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
576 |
- |
577 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
578 |
- description="Create the Tomcat javadoc" > |
579 |
-+<!-- |
580 |
- <javadoc packagenames="javax.servlet.*" |
581 |
- excludepackagenames="javax.servlet.jsp.*" |
582 |
- sourcepath="${tomcat.dist}/src/java" |
583 |
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
584 |
- <path location="${ant.core.lib}"/> |
585 |
- </classpath> |
586 |
- </javadoc> |
587 |
-+--> |
588 |
- <javadoc packagenames="javax.websocket.*" |
589 |
- sourcepath="${tomcat.dist}/src/java" |
590 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
591 |
-@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
592 |
- <path refid="tomcat.webservices.classpath"/> |
593 |
- <path location="${ant.core.lib}"/> |
594 |
- </classpath> |
595 |
-+<!-- |
596 |
- <link href="../servletapi"/> |
597 |
- <link href="../jspapi"/> |
598 |
- <link href="../elapi"/> |
599 |
-+--> |
600 |
- <link href="../websocketapi"/> |
601 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
602 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
603 |
-@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> |
604 |
- </target> |
605 |
- |
606 |
- <target name="download-compile" |
607 |
-- description="Download (and build) components necessary to compile" > |
608 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
609 |
- |
610 |
- <antcall target="downloadfile-2"> |
611 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
612 |
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> |
613 |
- </target> |
614 |
- |
615 |
- <target name="download-test-compile" |
616 |
-- description="Download additional components for the tests" > |
617 |
-+ description="Download additional components for the tests" unless="noget"> |
618 |
- |
619 |
- <antcall target="downloadfile"> |
620 |
- <param name="sourcefile" value="${junit.loc}"/> |
621 |
-@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> |
622 |
- </target> |
623 |
- |
624 |
- <target name="download-dist" |
625 |
-- description="Download additional components for a distribution" > |
626 |
-+ description="Download additional components for a distribution" unless="noget"> |
627 |
- |
628 |
- <antcall target="downloadzip-2"> |
629 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
630 |
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> |
631 |
- |
632 |
- <!-- =============== Utility Targets to support downloads ================ --> |
633 |
- |
634 |
-- <target name="setproxy" if="${proxy.use}"> |
635 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
636 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
637 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
638 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
639 |
- </target> |
640 |
- |
641 |
-- <target name="testexist"> |
642 |
-+ <target name="testexist" unless="noget"> |
643 |
- <echo message="Testing for ${destfile}"/> |
644 |
- <available file="${destfile}" property="exist"/> |
645 |
- </target> |
646 |
- |
647 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
648 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
649 |
- <!-- Download and extract the package --> |
650 |
- <local name="temp.file"/> |
651 |
- <mkdir dir="${base.path}"/> |
652 |
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> |
653 |
- <delete file="${temp.file}.tar.gz"/> |
654 |
- </target> |
655 |
- |
656 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
657 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
658 |
- <!-- Download and extract the package from the two alternative locations --> |
659 |
- <local name="temp.file"/> |
660 |
- <mkdir dir="${base.path}"/> |
661 |
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> |
662 |
- <delete file="${temp.file}.tar.gz"/> |
663 |
- </target> |
664 |
- |
665 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
666 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
667 |
- <!-- Download and extract the package --> |
668 |
- <local name="temp.file"/> |
669 |
- <mkdir dir="${base.path}"/> |
670 |
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> |
671 |
- <delete file="${temp.file}"/> |
672 |
- </target> |
673 |
- |
674 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
675 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
676 |
- <!-- Download and extract the package from the two alternative locations --> |
677 |
- <local name="temp.file"/> |
678 |
- <mkdir dir="${base.path}"/> |
679 |
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> |
680 |
- <delete file="${temp.file}"/> |
681 |
- </target> |
682 |
- |
683 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
684 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
685 |
- <!-- Download the file --> |
686 |
- <local name="temp.file"/> |
687 |
- <mkdir dir="${base.path}"/> |
688 |
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> |
689 |
- <move file="${temp.file}" tofile="${destfile}"/> |
690 |
- </target> |
691 |
- |
692 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
693 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
694 |
- <!-- Download the file from the two alternative locations --> |
695 |
- <local name="temp.file"/> |
696 |
- <mkdir dir="${base.path}"/> |
697 |
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> |
698 |
- <move file="${temp.file}" tofile="${destfile}"/> |
699 |
- </target> |
700 |
- |
701 |
-- <target name="trydownload.check" depends="setproxy"> |
702 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
703 |
- <condition property="trydownload.run"> |
704 |
- <and> |
705 |
- <not> |
706 |
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> |
707 |
- </condition> |
708 |
- </target> |
709 |
- |
710 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
711 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
712 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
713 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
714 |
- </target> |
715 |
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> |
716 |
- |
717 |
- <target name="ide-eclipse" |
718 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
719 |
-- description="Prepares the source tree to be built in Eclipse"> |
720 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
721 |
- |
722 |
- <!-- Copy the sample project files into the root directory --> |
723 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
724 |
|
725 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch |
726 |
deleted file mode 100644 |
727 |
index 611c99d7a0e..00000000000 |
728 |
--- a/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch |
729 |
+++ /dev/null |
730 |
@@ -1,250 +0,0 @@ |
731 |
-diff --git a/apache-tomcat-8.5.4-src/build.xml b/apache-tomcat-8.5.4-src/build.xml |
732 |
-index 655e379..b973b7f 100644 |
733 |
---- a/apache-tomcat-8.5.4-src/build.xml |
734 |
-+++ b/apache-tomcat-8.5.4-src/build.xml |
735 |
-@@ -691,24 +691,29 @@ |
736 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
737 |
- |
738 |
- <!-- Servlet 3.1 Implementation JAR File --> |
739 |
-+<!-- |
740 |
- <jarIt jarfile="${servlet-api.jar}" |
741 |
- filesDir="${tomcat.classes}" |
742 |
- filesId="files.servlet-api" |
743 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
744 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
745 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
746 |
-- |
747 |
-+--> |
748 |
- <!-- JSP 2.3 Implementation JAR File --> |
749 |
-+<!-- |
750 |
- <jarIt jarfile="${jsp-api.jar}" |
751 |
- filesDir="${tomcat.classes}" |
752 |
- filesId="files.jsp-api" |
753 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
754 |
-+--> |
755 |
- |
756 |
- <!-- EL 3.0 Implementation JAR File --> |
757 |
-+<!-- |
758 |
- <jarIt jarfile="${el-api.jar}" |
759 |
- filesDir="${tomcat.classes}" |
760 |
- filesId="files.el-api" |
761 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
762 |
-+--> |
763 |
- |
764 |
- <!-- WebSocket 1.1 API JAR File --> |
765 |
- <jarIt jarfile="${websocket-api.jar}" |
766 |
-@@ -982,14 +987,14 @@ |
767 |
- |
768 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
769 |
- description="Default. Builds a working Tomcat instance"> |
770 |
-- |
771 |
-+<!-- |
772 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
773 |
- file="${tomcat-native.tar.gz}" /> |
774 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
775 |
- file="${commons-daemon.native.src.tgz}" /> |
776 |
- |
777 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
778 |
-- |
779 |
-+--> |
780 |
- <!-- Copy scripts --> |
781 |
- <copy todir="${tomcat.build}/bin"> |
782 |
- <fileset dir="bin"> |
783 |
-@@ -1049,7 +1054,7 @@ |
784 |
- <exclude name="${jdt.jar.filename}"/> |
785 |
- </fileset> |
786 |
- </delete> |
787 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
788 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
789 |
- |
790 |
- <!-- Add sources for examples --> |
791 |
- <antcall target="examples-sources" /> |
792 |
-@@ -1083,7 +1088,7 @@ |
793 |
- </javac> |
794 |
- </target> |
795 |
- |
796 |
-- <target name="build-tomcat-jdbc" depends="package"> |
797 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
798 |
- <!-- build the jdbc-pool jar and source jar--> |
799 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
800 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
801 |
-@@ -1098,7 +1103,7 @@ |
802 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
803 |
- </target> |
804 |
- |
805 |
-- <target name="build-tomcat-jdbc-src"> |
806 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
807 |
- <!-- build the jdbc-pool source jar--> |
808 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
809 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
810 |
-@@ -1202,10 +1207,11 @@ |
811 |
- |
812 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
813 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
814 |
-+<!-- |
815 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
816 |
- failonerror="false"/> |
817 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
818 |
-- |
819 |
-+--> |
820 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
821 |
- that needs to add entries. If there is more than one a more complex |
822 |
- solution will be required. --> |
823 |
-@@ -1579,7 +1585,7 @@ |
824 |
- |
825 |
- <target name="extras-webservices-prepare" |
826 |
- depends="extras-prepare" |
827 |
-- description="Prepare to build web services extras package"> |
828 |
-+ description="Prepare to build web services extras package" unless="noget"> |
829 |
- |
830 |
- <antcall target="downloadfile"> |
831 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
832 |
-@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
833 |
- |
834 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
835 |
- description="Create the Tomcat javadoc" > |
836 |
-+<!-- |
837 |
- <javadoc packagenames="javax.servlet.*" |
838 |
- excludepackagenames="javax.servlet.jsp.*" |
839 |
- sourcepath="${tomcat.dist}/src/java" |
840 |
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
841 |
- <path location="${ant.core.lib}"/> |
842 |
- </classpath> |
843 |
- </javadoc> |
844 |
-+--> |
845 |
- <javadoc packagenames="javax.websocket.*" |
846 |
- sourcepath="${tomcat.dist}/src/java" |
847 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
848 |
-@@ -1831,9 +1839,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
849 |
- <path refid="tomcat.webservices.classpath"/> |
850 |
- <path location="${ant.core.lib}"/> |
851 |
- </classpath> |
852 |
-+<!-- |
853 |
- <link href="../servletapi"/> |
854 |
- <link href="../jspapi"/> |
855 |
- <link href="../elapi"/> |
856 |
-+--> |
857 |
- <link href="../websocketapi"/> |
858 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
859 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
860 |
-@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" /> |
861 |
- </target> |
862 |
- |
863 |
- <target name="download-compile" |
864 |
-- description="Download (and build) components necessary to compile" > |
865 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
866 |
- |
867 |
- <antcall target="downloadfile-2"> |
868 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
869 |
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" /> |
870 |
- </target> |
871 |
- |
872 |
- <target name="download-test-compile" |
873 |
-- description="Download additional components for the tests" > |
874 |
-+ description="Download additional components for the tests" unless="noget"> |
875 |
- |
876 |
- <antcall target="downloadfile"> |
877 |
- <param name="sourcefile" value="${junit.loc}"/> |
878 |
-@@ -2665,7 +2675,7 @@ skip.installer property in build.properties" /> |
879 |
- </target> |
880 |
- |
881 |
- <target name="download-dist" |
882 |
-- description="Download additional components for a distribution" > |
883 |
-+ description="Download additional components for a distribution" unless="noget"> |
884 |
- |
885 |
- <antcall target="downloadzip-2"> |
886 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
887 |
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" /> |
888 |
- |
889 |
- <!-- =============== Utility Targets to support downloads ================ --> |
890 |
- |
891 |
-- <target name="setproxy" if="${proxy.use}"> |
892 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
893 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
894 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
895 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
896 |
- </target> |
897 |
- |
898 |
-- <target name="testexist"> |
899 |
-+ <target name="testexist" unless="noget"> |
900 |
- <echo message="Testing for ${destfile}"/> |
901 |
- <available file="${destfile}" property="exist"/> |
902 |
- </target> |
903 |
- |
904 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
905 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
906 |
- <!-- Download and extract the package --> |
907 |
- <local name="temp.file"/> |
908 |
- <mkdir dir="${base.path}"/> |
909 |
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" /> |
910 |
- <delete file="${temp.file}.tar.gz"/> |
911 |
- </target> |
912 |
- |
913 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
914 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
915 |
- <!-- Download and extract the package from the two alternative locations --> |
916 |
- <local name="temp.file"/> |
917 |
- <mkdir dir="${base.path}"/> |
918 |
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" /> |
919 |
- <delete file="${temp.file}.tar.gz"/> |
920 |
- </target> |
921 |
- |
922 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
923 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
924 |
- <!-- Download and extract the package --> |
925 |
- <local name="temp.file"/> |
926 |
- <mkdir dir="${base.path}"/> |
927 |
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" /> |
928 |
- <delete file="${temp.file}"/> |
929 |
- </target> |
930 |
- |
931 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
932 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
933 |
- <!-- Download and extract the package from the two alternative locations --> |
934 |
- <local name="temp.file"/> |
935 |
- <mkdir dir="${base.path}"/> |
936 |
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" /> |
937 |
- <delete file="${temp.file}"/> |
938 |
- </target> |
939 |
- |
940 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
941 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
942 |
- <!-- Download the file --> |
943 |
- <local name="temp.file"/> |
944 |
- <mkdir dir="${base.path}"/> |
945 |
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" /> |
946 |
- <move file="${temp.file}" tofile="${destfile}"/> |
947 |
- </target> |
948 |
- |
949 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
950 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
951 |
- <!-- Download the file from the two alternative locations --> |
952 |
- <local name="temp.file"/> |
953 |
- <mkdir dir="${base.path}"/> |
954 |
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" /> |
955 |
- <move file="${temp.file}" tofile="${destfile}"/> |
956 |
- </target> |
957 |
- |
958 |
-- <target name="trydownload.check" depends="setproxy"> |
959 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
960 |
- <condition property="trydownload.run"> |
961 |
- <and> |
962 |
- <not> |
963 |
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" /> |
964 |
- </condition> |
965 |
- </target> |
966 |
- |
967 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
968 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
969 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
970 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
971 |
- </target> |
972 |
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" /> |
973 |
- |
974 |
- <target name="ide-eclipse" |
975 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
976 |
-- description="Prepares the source tree to be built in Eclipse"> |
977 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
978 |
- |
979 |
- <!-- Copy the sample project files into the root directory --> |
980 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
981 |
|
982 |
diff --git a/www-servers/tomcat/tomcat-7.0.81.ebuild b/www-servers/tomcat/tomcat-7.0.81.ebuild |
983 |
deleted file mode 100644 |
984 |
index 0d01aa49b31..00000000000 |
985 |
--- a/www-servers/tomcat/tomcat-7.0.81.ebuild |
986 |
+++ /dev/null |
987 |
@@ -1,148 +0,0 @@ |
988 |
-# Copyright 1999-2017 Gentoo Foundation |
989 |
-# Distributed under the terms of the GNU General Public License v2 |
990 |
- |
991 |
-EAPI=6 |
992 |
- |
993 |
-JAVA_PKG_IUSE="doc source test" |
994 |
- |
995 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
996 |
- |
997 |
-MY_P="apache-${P}-src" |
998 |
- |
999 |
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
1000 |
-HOMEPAGE="http://tomcat.apache.org/" |
1001 |
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
1002 |
- |
1003 |
-LICENSE="Apache-2.0" |
1004 |
-SLOT="7" |
1005 |
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" |
1006 |
-IUSE="extra-webapps websockets" |
1007 |
- |
1008 |
-RESTRICT="test" # can we run them on a production system? |
1009 |
- |
1010 |
-ECJ_SLOT="4.5" |
1011 |
-SAPI_SLOT="3.0" |
1012 |
- |
1013 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1014 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
1015 |
-RDEPEND="${COMMON_DEP} |
1016 |
- websockets? ( >=virtual/jre-1.7 ) |
1017 |
- !websockets? ( >=virtual/jre-1.6 ) |
1018 |
- !<dev-java/tomcat-native-1.1.24" |
1019 |
-DEPEND="${COMMON_DEP} |
1020 |
- websockets? ( >=virtual/jdk-1.7 ) |
1021 |
- !websockets? ( >=virtual/jdk-1.6 ) |
1022 |
- test? ( dev-java/ant-junit:0 )" |
1023 |
- |
1024 |
-S=${WORKDIR}/${MY_P} |
1025 |
- |
1026 |
-pkg_setup() { |
1027 |
- java-pkg-2_pkg_setup |
1028 |
- enewgroup tomcat 265 |
1029 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1030 |
-} |
1031 |
- |
1032 |
-src_prepare() { |
1033 |
- default |
1034 |
- |
1035 |
- # Remove bundled servlet-api |
1036 |
- rm -rv java/javax/{el,servlet} || die |
1037 |
- |
1038 |
- java-pkg_clean |
1039 |
- |
1040 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1041 |
- |
1042 |
- # For use of catalina.sh in netbeans |
1043 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1044 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1045 |
- bin/catalina.sh || die |
1046 |
- |
1047 |
- java-pkg-2_src_prepare |
1048 |
-} |
1049 |
- |
1050 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1051 |
- |
1052 |
-EANT_BUILD_TARGET="deploy" |
1053 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
1054 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1055 |
-EANT_NEEDS_TOOLS="true" |
1056 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1057 |
- |
1058 |
-# revisions of the scripts |
1059 |
-IM_REV="-r1" |
1060 |
-INIT_REV="-r1" |
1061 |
- |
1062 |
-src_compile() { |
1063 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
1064 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1065 |
- java-pkg-2_src_compile |
1066 |
-} |
1067 |
- |
1068 |
-src_test() { |
1069 |
- java-pkg-2_src_test |
1070 |
-} |
1071 |
- |
1072 |
-src_install() { |
1073 |
- local dest="/usr/share/${PN}-${SLOT}" |
1074 |
- |
1075 |
- java-pkg_jarinto "${dest}"/bin |
1076 |
- java-pkg_dojar output/build/bin/*.jar |
1077 |
- exeinto "${dest}"/bin |
1078 |
- doexe output/build/bin/*.sh |
1079 |
- |
1080 |
- java-pkg_jarinto "${dest}"/lib |
1081 |
- java-pkg_dojar output/build/lib/*.jar |
1082 |
- |
1083 |
- dodoc RELEASE-NOTES RUNNING.txt |
1084 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1085 |
- use source && java-pkg_dosrc java/* |
1086 |
- |
1087 |
- ### Webapps ### |
1088 |
- |
1089 |
- insinto "${dest}"/webapps |
1090 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1091 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1092 |
- |
1093 |
- ### Config ### |
1094 |
- |
1095 |
- # create "logs" directory in $CATALINA_BASE |
1096 |
- # and set correct perms, see #458890 |
1097 |
- dodir "${dest}"/logs |
1098 |
- fperms 0750 "${dest}"/logs |
1099 |
- |
1100 |
- # replace the default pw with a random one, see #92281 |
1101 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
1102 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1103 |
- |
1104 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1105 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1106 |
- |
1107 |
- insinto "${dest}" |
1108 |
- doins -r output/build/conf |
1109 |
- |
1110 |
- ### rc ### |
1111 |
- |
1112 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1113 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1114 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1115 |
- |
1116 |
- insinto "${dest}"/gentoo |
1117 |
- doins "${T}"/tomcat.conf |
1118 |
- exeinto "${dest}"/gentoo |
1119 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1120 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1121 |
-} |
1122 |
- |
1123 |
-pkg_postinst() { |
1124 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1125 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1126 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1127 |
- |
1128 |
- elog "To manage Tomcat instances, run:" |
1129 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1130 |
- |
1131 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1132 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1133 |
- |
1134 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1135 |
-} |
1136 |
|
1137 |
diff --git a/www-servers/tomcat/tomcat-8.0.45.ebuild b/www-servers/tomcat/tomcat-8.0.45.ebuild |
1138 |
deleted file mode 100644 |
1139 |
index 1e01093d259..00000000000 |
1140 |
--- a/www-servers/tomcat/tomcat-8.0.45.ebuild |
1141 |
+++ /dev/null |
1142 |
@@ -1,157 +0,0 @@ |
1143 |
-# Copyright 1999-2017 Gentoo Foundation |
1144 |
-# Distributed under the terms of the GNU General Public License v2 |
1145 |
- |
1146 |
-EAPI=6 |
1147 |
- |
1148 |
-JAVA_PKG_IUSE="doc source test" |
1149 |
- |
1150 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
1151 |
- |
1152 |
-MY_P="apache-${P}-src" |
1153 |
- |
1154 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
1155 |
-HOMEPAGE="http://tomcat.apache.org/" |
1156 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
1157 |
- |
1158 |
-LICENSE="Apache-2.0" |
1159 |
-SLOT="8" |
1160 |
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
1161 |
-IUSE="extra-webapps" |
1162 |
- |
1163 |
-RESTRICT="test" # can we run them on a production system? |
1164 |
- |
1165 |
-ECJ_SLOT="4.5" |
1166 |
-SAPI_SLOT="3.1" |
1167 |
- |
1168 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1169 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
1170 |
-RDEPEND="${COMMON_DEP} |
1171 |
- !<dev-java/tomcat-native-1.1.24 |
1172 |
- >=virtual/jre-1.7" |
1173 |
-DEPEND="${COMMON_DEP} |
1174 |
- app-admin/pwgen |
1175 |
- >=virtual/jdk-1.7 |
1176 |
- test? ( |
1177 |
- >=dev-java/ant-junit-1.9:0 |
1178 |
- dev-java/easymock:3.2 |
1179 |
- )" |
1180 |
- |
1181 |
-S=${WORKDIR}/${MY_P} |
1182 |
- |
1183 |
-pkg_setup() { |
1184 |
- java-pkg-2_pkg_setup |
1185 |
- enewgroup tomcat 265 |
1186 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1187 |
-} |
1188 |
- |
1189 |
-src_prepare() { |
1190 |
- default |
1191 |
- |
1192 |
- find -name '*.jar' -type f -delete -print || die |
1193 |
- |
1194 |
- # Remove bundled servlet-api |
1195 |
- rm -rv java/javax/{el,servlet} || die |
1196 |
- |
1197 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1198 |
- |
1199 |
- # For use of catalina.sh in netbeans |
1200 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1201 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1202 |
- bin/catalina.sh || die |
1203 |
- |
1204 |
- java-pkg-2_src_prepare |
1205 |
-} |
1206 |
- |
1207 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1208 |
- |
1209 |
-EANT_BUILD_TARGET="deploy" |
1210 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
1211 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
1212 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1213 |
-EANT_NEEDS_TOOLS="true" |
1214 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1215 |
- |
1216 |
-# revisions of the scripts |
1217 |
-IM_REV="-r2" |
1218 |
-INIT_REV="-r1" |
1219 |
- |
1220 |
-src_compile() { |
1221 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1222 |
- java-pkg-2_src_compile |
1223 |
-} |
1224 |
- |
1225 |
-src_test() { |
1226 |
- java-pkg-2_src_test |
1227 |
-} |
1228 |
- |
1229 |
-src_install() { |
1230 |
- local dest="/usr/share/${PN}-${SLOT}" |
1231 |
- |
1232 |
- java-pkg_jarinto "${dest}"/bin |
1233 |
- java-pkg_dojar output/build/bin/*.jar |
1234 |
- exeinto "${dest}"/bin |
1235 |
- doexe output/build/bin/*.sh |
1236 |
- |
1237 |
- java-pkg_jarinto "${dest}"/lib |
1238 |
- java-pkg_dojar output/build/lib/*.jar |
1239 |
- |
1240 |
- dodoc RELEASE-NOTES RUNNING.txt |
1241 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1242 |
- use source && java-pkg_dosrc java/* |
1243 |
- |
1244 |
- ### Webapps ### |
1245 |
- |
1246 |
- # add missing docBase |
1247 |
- local apps="host-manager manager" |
1248 |
- for app in ${apps}; do |
1249 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
1250 |
- output/build/webapps/${app}/META-INF/context.xml || die |
1251 |
- done |
1252 |
- |
1253 |
- insinto "${dest}"/webapps |
1254 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1255 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1256 |
- |
1257 |
- ### Config ### |
1258 |
- |
1259 |
- # create "logs" directory in $CATALINA_BASE |
1260 |
- # and set correct perms, see #458890 |
1261 |
- dodir "${dest}"/logs |
1262 |
- fperms 0750 "${dest}"/logs |
1263 |
- |
1264 |
- # replace the default pw with a random one, see #92281 |
1265 |
- local randpw="$(pwgen -s -B 15 1)" |
1266 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1267 |
- |
1268 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1269 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1270 |
- |
1271 |
- insinto "${dest}" |
1272 |
- doins -r output/build/conf |
1273 |
- |
1274 |
- ### rc ### |
1275 |
- |
1276 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1277 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1278 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1279 |
- |
1280 |
- insinto "${dest}"/gentoo |
1281 |
- doins "${T}"/tomcat.conf |
1282 |
- exeinto "${dest}"/gentoo |
1283 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1284 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1285 |
-} |
1286 |
- |
1287 |
-pkg_postinst() { |
1288 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1289 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1290 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1291 |
- |
1292 |
- elog "To manage Tomcat instances, run:" |
1293 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1294 |
- |
1295 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1296 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1297 |
- |
1298 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1299 |
-} |
1300 |
|
1301 |
diff --git a/www-servers/tomcat/tomcat-8.0.46.ebuild b/www-servers/tomcat/tomcat-8.0.46.ebuild |
1302 |
deleted file mode 100644 |
1303 |
index 0275eef0064..00000000000 |
1304 |
--- a/www-servers/tomcat/tomcat-8.0.46.ebuild |
1305 |
+++ /dev/null |
1306 |
@@ -1,157 +0,0 @@ |
1307 |
-# Copyright 1999-2017 Gentoo Foundation |
1308 |
-# Distributed under the terms of the GNU General Public License v2 |
1309 |
- |
1310 |
-EAPI=6 |
1311 |
- |
1312 |
-JAVA_PKG_IUSE="doc source test" |
1313 |
- |
1314 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
1315 |
- |
1316 |
-MY_P="apache-${P}-src" |
1317 |
- |
1318 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
1319 |
-HOMEPAGE="https://tomcat.apache.org/" |
1320 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
1321 |
- |
1322 |
-LICENSE="Apache-2.0" |
1323 |
-SLOT="8" |
1324 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
1325 |
-IUSE="extra-webapps" |
1326 |
- |
1327 |
-RESTRICT="test" # can we run them on a production system? |
1328 |
- |
1329 |
-ECJ_SLOT="4.5" |
1330 |
-SAPI_SLOT="3.1" |
1331 |
- |
1332 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1333 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
1334 |
-RDEPEND="${COMMON_DEP} |
1335 |
- !<dev-java/tomcat-native-1.1.24 |
1336 |
- >=virtual/jre-1.7" |
1337 |
-DEPEND="${COMMON_DEP} |
1338 |
- app-admin/pwgen |
1339 |
- >=virtual/jdk-1.7 |
1340 |
- test? ( |
1341 |
- >=dev-java/ant-junit-1.9:0 |
1342 |
- dev-java/easymock:3.2 |
1343 |
- )" |
1344 |
- |
1345 |
-S=${WORKDIR}/${MY_P} |
1346 |
- |
1347 |
-pkg_setup() { |
1348 |
- java-pkg-2_pkg_setup |
1349 |
- enewgroup tomcat 265 |
1350 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1351 |
-} |
1352 |
- |
1353 |
-src_prepare() { |
1354 |
- default |
1355 |
- |
1356 |
- find -name '*.jar' -type f -delete -print || die |
1357 |
- |
1358 |
- # Remove bundled servlet-api |
1359 |
- rm -rv java/javax/{el,servlet} || die |
1360 |
- |
1361 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1362 |
- |
1363 |
- # For use of catalina.sh in netbeans |
1364 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1365 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1366 |
- bin/catalina.sh || die |
1367 |
- |
1368 |
- java-pkg-2_src_prepare |
1369 |
-} |
1370 |
- |
1371 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1372 |
- |
1373 |
-EANT_BUILD_TARGET="deploy" |
1374 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
1375 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
1376 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1377 |
-EANT_NEEDS_TOOLS="true" |
1378 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1379 |
- |
1380 |
-# revisions of the scripts |
1381 |
-IM_REV="-r2" |
1382 |
-INIT_REV="-r1" |
1383 |
- |
1384 |
-src_compile() { |
1385 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1386 |
- java-pkg-2_src_compile |
1387 |
-} |
1388 |
- |
1389 |
-src_test() { |
1390 |
- java-pkg-2_src_test |
1391 |
-} |
1392 |
- |
1393 |
-src_install() { |
1394 |
- local dest="/usr/share/${PN}-${SLOT}" |
1395 |
- |
1396 |
- java-pkg_jarinto "${dest}"/bin |
1397 |
- java-pkg_dojar output/build/bin/*.jar |
1398 |
- exeinto "${dest}"/bin |
1399 |
- doexe output/build/bin/*.sh |
1400 |
- |
1401 |
- java-pkg_jarinto "${dest}"/lib |
1402 |
- java-pkg_dojar output/build/lib/*.jar |
1403 |
- |
1404 |
- dodoc RELEASE-NOTES RUNNING.txt |
1405 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1406 |
- use source && java-pkg_dosrc java/* |
1407 |
- |
1408 |
- ### Webapps ### |
1409 |
- |
1410 |
- # add missing docBase |
1411 |
- local apps="host-manager manager" |
1412 |
- for app in ${apps}; do |
1413 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
1414 |
- output/build/webapps/${app}/META-INF/context.xml || die |
1415 |
- done |
1416 |
- |
1417 |
- insinto "${dest}"/webapps |
1418 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1419 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1420 |
- |
1421 |
- ### Config ### |
1422 |
- |
1423 |
- # create "logs" directory in $CATALINA_BASE |
1424 |
- # and set correct perms, see #458890 |
1425 |
- dodir "${dest}"/logs |
1426 |
- fperms 0750 "${dest}"/logs |
1427 |
- |
1428 |
- # replace the default pw with a random one, see #92281 |
1429 |
- local randpw="$(pwgen -s -B 15 1)" |
1430 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1431 |
- |
1432 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1433 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1434 |
- |
1435 |
- insinto "${dest}" |
1436 |
- doins -r output/build/conf |
1437 |
- |
1438 |
- ### rc ### |
1439 |
- |
1440 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1441 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1442 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1443 |
- |
1444 |
- insinto "${dest}"/gentoo |
1445 |
- doins "${T}"/tomcat.conf |
1446 |
- exeinto "${dest}"/gentoo |
1447 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1448 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1449 |
-} |
1450 |
- |
1451 |
-pkg_postinst() { |
1452 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1453 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1454 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1455 |
- |
1456 |
- elog "To manage Tomcat instances, run:" |
1457 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1458 |
- |
1459 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1460 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1461 |
- |
1462 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1463 |
-} |
1464 |
|
1465 |
diff --git a/www-servers/tomcat/tomcat-8.5.20.ebuild b/www-servers/tomcat/tomcat-8.5.20.ebuild |
1466 |
deleted file mode 100644 |
1467 |
index 94c1abd6a55..00000000000 |
1468 |
--- a/www-servers/tomcat/tomcat-8.5.20.ebuild |
1469 |
+++ /dev/null |
1470 |
@@ -1,157 +0,0 @@ |
1471 |
-# Copyright 1999-2017 Gentoo Foundation |
1472 |
-# Distributed under the terms of the GNU General Public License v2 |
1473 |
- |
1474 |
-EAPI=6 |
1475 |
- |
1476 |
-JAVA_PKG_IUSE="doc source test" |
1477 |
- |
1478 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
1479 |
- |
1480 |
-MY_P="apache-${P}-src" |
1481 |
- |
1482 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
1483 |
-HOMEPAGE="http://tomcat.apache.org/" |
1484 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
1485 |
- |
1486 |
-LICENSE="Apache-2.0" |
1487 |
-SLOT="8.5" |
1488 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
1489 |
-IUSE="extra-webapps" |
1490 |
- |
1491 |
-RESTRICT="test" # can we run them on a production system? |
1492 |
- |
1493 |
-ECJ_SLOT="4.5" |
1494 |
-SAPI_SLOT="3.1" |
1495 |
- |
1496 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1497 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
1498 |
-RDEPEND="${COMMON_DEP} |
1499 |
- !<dev-java/tomcat-native-1.1.24 |
1500 |
- >=virtual/jre-1.7" |
1501 |
-DEPEND="${COMMON_DEP} |
1502 |
- app-admin/pwgen |
1503 |
- >=virtual/jdk-1.7 |
1504 |
- test? ( |
1505 |
- >=dev-java/ant-junit-1.9:0 |
1506 |
- dev-java/easymock:3.2 |
1507 |
- )" |
1508 |
- |
1509 |
-S=${WORKDIR}/${MY_P} |
1510 |
- |
1511 |
-pkg_setup() { |
1512 |
- java-pkg-2_pkg_setup |
1513 |
- enewgroup tomcat 265 |
1514 |
- enewuser tomcat 265 -1 /dev/null tomcat |
1515 |
-} |
1516 |
- |
1517 |
-src_prepare() { |
1518 |
- default |
1519 |
- |
1520 |
- find -name '*.jar' -type f -delete -print || die |
1521 |
- |
1522 |
- # Remove bundled servlet-api |
1523 |
- rm -rv java/javax/{el,servlet} || die |
1524 |
- |
1525 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
1526 |
- |
1527 |
- # For use of catalina.sh in netbeans |
1528 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1529 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
1530 |
- bin/catalina.sh || die |
1531 |
- |
1532 |
- java-pkg-2_src_prepare |
1533 |
-} |
1534 |
- |
1535 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1536 |
- |
1537 |
-EANT_BUILD_TARGET="deploy" |
1538 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
1539 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
1540 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1541 |
-EANT_NEEDS_TOOLS="true" |
1542 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
1543 |
- |
1544 |
-# revisions of the scripts |
1545 |
-IM_REV="-r2" |
1546 |
-INIT_REV="-r1" |
1547 |
- |
1548 |
-src_compile() { |
1549 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
1550 |
- java-pkg-2_src_compile |
1551 |
-} |
1552 |
- |
1553 |
-src_test() { |
1554 |
- java-pkg-2_src_test |
1555 |
-} |
1556 |
- |
1557 |
-src_install() { |
1558 |
- local dest="/usr/share/${PN}-${SLOT}" |
1559 |
- |
1560 |
- java-pkg_jarinto "${dest}"/bin |
1561 |
- java-pkg_dojar output/build/bin/*.jar |
1562 |
- exeinto "${dest}"/bin |
1563 |
- doexe output/build/bin/*.sh |
1564 |
- |
1565 |
- java-pkg_jarinto "${dest}"/lib |
1566 |
- java-pkg_dojar output/build/lib/*.jar |
1567 |
- |
1568 |
- dodoc RELEASE-NOTES RUNNING.txt |
1569 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1570 |
- use source && java-pkg_dosrc java/* |
1571 |
- |
1572 |
- ### Webapps ### |
1573 |
- |
1574 |
- # add missing docBase |
1575 |
- local apps="host-manager manager" |
1576 |
- for app in ${apps}; do |
1577 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
1578 |
- output/build/webapps/${app}/META-INF/context.xml || die |
1579 |
- done |
1580 |
- |
1581 |
- insinto "${dest}"/webapps |
1582 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1583 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1584 |
- |
1585 |
- ### Config ### |
1586 |
- |
1587 |
- # create "logs" directory in $CATALINA_BASE |
1588 |
- # and set correct perms, see #458890 |
1589 |
- dodir "${dest}"/logs |
1590 |
- fperms 0750 "${dest}"/logs |
1591 |
- |
1592 |
- # replace the default pw with a random one, see #92281 |
1593 |
- local randpw="$(pwgen -s -B 15 1)" |
1594 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1595 |
- |
1596 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1597 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1598 |
- |
1599 |
- insinto "${dest}" |
1600 |
- doins -r output/build/conf |
1601 |
- |
1602 |
- ### rc ### |
1603 |
- |
1604 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1605 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1606 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1607 |
- |
1608 |
- insinto "${dest}"/gentoo |
1609 |
- doins "${T}"/tomcat.conf |
1610 |
- exeinto "${dest}"/gentoo |
1611 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1612 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1613 |
-} |
1614 |
- |
1615 |
-pkg_postinst() { |
1616 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1617 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1618 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1619 |
- |
1620 |
- elog "To manage Tomcat instances, run:" |
1621 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1622 |
- |
1623 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1624 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1625 |
- |
1626 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
1627 |
-} |