1 |
commit: 4ef3aa395edf71f6659df4813a424d47359e1db6 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 17 07:04:03 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 17 07:06:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef3aa39 |
7 |
|
8 |
www-servers/tomcat: removed obsolete 8.5.65, 9.0.45 & 10.0.5 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 3 - |
14 |
.../tomcat/files/tomcat-8.5.65-build.xml.patch | 266 ------------------- |
15 |
.../tomcat/files/tomcat-9.0.45-build.xml.patch | 284 --------------------- |
16 |
www-servers/tomcat/tomcat-10.0.5.ebuild | 192 -------------- |
17 |
www-servers/tomcat/tomcat-8.5.65.ebuild | 159 ------------ |
18 |
www-servers/tomcat/tomcat-9.0.45.ebuild | 187 -------------- |
19 |
6 files changed, 1091 deletions(-) |
20 |
|
21 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
22 |
index f982863a11b..5325e3686e5 100644 |
23 |
--- a/www-servers/tomcat/Manifest |
24 |
+++ b/www-servers/tomcat/Manifest |
25 |
@@ -1,9 +1,6 @@ |
26 |
-DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f |
27 |
DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100 |
28 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
29 |
-DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa |
30 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
31 |
-DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e |
32 |
DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1 |
33 |
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 |
34 |
DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b |
35 |
|
36 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch |
37 |
deleted file mode 100644 |
38 |
index 66411238a3d..00000000000 |
39 |
--- a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch |
40 |
+++ /dev/null |
41 |
@@ -1,266 +0,0 @@ |
42 |
-diff --git a/build.xml b/build.xml |
43 |
-index 19be6ed..c1557cd 100644 |
44 |
---- a/build.xml |
45 |
-+++ b/build.xml |
46 |
-@@ -772,25 +772,28 @@ |
47 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
48 |
- |
49 |
- <!-- Servlet 3.1 Implementation JAR File --> |
50 |
-+<!-- |
51 |
- <jarIt jarfile="${servlet-api.jar}" |
52 |
- filesDir="${tomcat.classes}" |
53 |
- filesId="files.servlet-api" |
54 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
55 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
56 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
57 |
-- |
58 |
-+--> |
59 |
- <!-- EL Implementation JAR File --> |
60 |
-+<!-- |
61 |
- <jarIt jarfile="${el-api.jar}" |
62 |
- filesDir="${tomcat.classes}" |
63 |
- filesId="files.el-api" |
64 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
65 |
-- |
66 |
-+--> |
67 |
- <!-- JSP Implementation JAR File --> |
68 |
-+<!-- |
69 |
- <jarIt jarfile="${jsp-api.jar}" |
70 |
- filesDir="${tomcat.classes}" |
71 |
- filesId="files.jsp-api" |
72 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
73 |
-- |
74 |
-+--> |
75 |
- <!-- WebSocket API JAR File --> |
76 |
- <jarIt jarfile="${websocket-api.jar}" |
77 |
- filesDir="${tomcat.classes}" |
78 |
-@@ -882,9 +885,9 @@ |
79 |
- meta-inf="${tomcat.manifests}/jasper.jar" /> |
80 |
- |
81 |
- <!-- Re-packaged Apache Commons DBCP 2--> |
82 |
-- <jarIt jarfile="${tomcat-dbcp.jar}" |
83 |
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" |
84 |
- filesDir="${tomcat.classes}" |
85 |
-- filesId="files.tomcat-dbcp" /> |
86 |
-+ filesId="files.tomcat-dbcp" /> --> |
87 |
- |
88 |
- <!-- i18n JARs --> |
89 |
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar" |
90 |
-@@ -1099,9 +1102,9 @@ |
91 |
- |
92 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
93 |
- description="Default. Builds a working Tomcat instance"> |
94 |
-- |
95 |
-+<!-- |
96 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
97 |
-- |
98 |
-+--> |
99 |
- <!-- Copy scripts --> |
100 |
- <copy todir="${tomcat.build}/bin"> |
101 |
- <fileset dir="bin"> |
102 |
-@@ -1161,7 +1164,7 @@ |
103 |
- <exclude name="${jdt.jar.filename}"/> |
104 |
- </fileset> |
105 |
- </delete> |
106 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
107 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
108 |
- |
109 |
- <!-- Add sources for examples --> |
110 |
- <antcall target="examples-sources" /> |
111 |
-@@ -1204,7 +1207,7 @@ |
112 |
- |
113 |
- </target> |
114 |
- |
115 |
-- <target name="build-tomcat-jdbc" depends="package"> |
116 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
117 |
- <!-- build the jdbc-pool jar and source jar--> |
118 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
119 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
120 |
-@@ -1220,7 +1223,7 @@ |
121 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
122 |
- </target> |
123 |
- |
124 |
-- <target name="build-tomcat-jdbc-src"> |
125 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
126 |
- <!-- build the jdbc-pool source jar--> |
127 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
128 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
129 |
-@@ -1323,9 +1326,11 @@ |
130 |
- |
131 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
132 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
133 |
-+<!-- |
134 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
135 |
- failonerror="false"/> |
136 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
137 |
-+--> |
138 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
139 |
- |
140 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
141 |
-@@ -1736,7 +1741,7 @@ |
142 |
- |
143 |
- <target name="extras-webservices-prepare" |
144 |
- depends="extras-prepare" |
145 |
-- description="Prepare to build web services extras package"> |
146 |
-+ description="Prepare to build web services extras package" unless="noget"> |
147 |
- |
148 |
- <antcall target="downloadfile"> |
149 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
150 |
-@@ -1921,6 +1926,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
151 |
- <path location="${ant.core.lib}"/> |
152 |
- </classpath> |
153 |
- </javadoc> |
154 |
-+<!-- |
155 |
- <javadoc packagenames="javax.servlet.*" |
156 |
- excludepackagenames="javax.servlet.jsp.*" |
157 |
- sourcepath="${tomcat.dist}/src/java" |
158 |
-@@ -1988,6 +1994,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
159 |
- <path location="${ant.core.lib}"/> |
160 |
- </classpath> |
161 |
- </javadoc> |
162 |
-+--> |
163 |
- <javadoc packagenames="javax.websocket.*" |
164 |
- sourcepath="${tomcat.dist}/src/java" |
165 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
166 |
-@@ -2051,13 +2058,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
167 |
- <path location="${ant.core.lib}"/> |
168 |
- </classpath> |
169 |
- <link href="../annotationapi"/> |
170 |
-+<!-- |
171 |
- <link href="../servletapi"/> |
172 |
- <link href="../jspapi"/> |
173 |
- <link href="../elapi"/> |
174 |
-+--> |
175 |
- <link href="../websocketapi"/> |
176 |
- <link href="../jaspicapi"/> |
177 |
-+<!-- |
178 |
- <link href="https://docs.oracle.com/javase/7/docs/api/"/> |
179 |
- <link href="https://docs.oracle.com/javaee/7/api/"/> |
180 |
-+--> |
181 |
- <packageset dir="${tomcat.dist}/src/java/"> |
182 |
- <include name="org/**"/> |
183 |
- <exclude name="org/apache/el/parser/**"/> |
184 |
-@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" /> |
185 |
- </target> |
186 |
- |
187 |
- <target name="download-compile" |
188 |
-- description="Download components necessary to compile" > |
189 |
-+ description="Download components necessary to compile" unless="noget" > |
190 |
- |
191 |
- <!-- Download Commons Daemon --> |
192 |
- <antcall target="downloadgz-2"> |
193 |
-@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" /> |
194 |
- </target> |
195 |
- |
196 |
- <target name="download-test-compile" |
197 |
-- description="Download additional components for the tests" > |
198 |
-+ description="Download additional components for the tests" unless="noget"> |
199 |
- |
200 |
- <antcall target="downloadfile"> |
201 |
- <param name="sourcefile" value="${junit.loc}"/> |
202 |
-@@ -2932,7 +2943,7 @@ skip.installer property in build.properties" /> |
203 |
- </target> |
204 |
- |
205 |
- <target name="download-dist" |
206 |
-- description="Download additional components for a distribution" > |
207 |
-+ description="Download additional components for a distribution" unless="noget"> |
208 |
- |
209 |
- <antcall target="downloadfile-2"> |
210 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
211 |
-@@ -2987,13 +2998,13 @@ skip.installer property in build.properties" /> |
212 |
- |
213 |
- <!-- =============== Utility Targets to support downloads ================ --> |
214 |
- |
215 |
-- <target name="setproxy" if="${proxy.use}"> |
216 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
217 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
218 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
219 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
220 |
- </target> |
221 |
- |
222 |
-- <target name="testexist"> |
223 |
-+ <target name="testexist" unless="noget"> |
224 |
- <echo message="Testing for ${destfile}"/> |
225 |
- <available file="${destfile}" property="exist"/> |
226 |
- </target> |
227 |
-@@ -3115,7 +3126,7 @@ skip.installer property in build.properties" /> |
228 |
- </sequential> |
229 |
- </macrodef> |
230 |
- |
231 |
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
232 |
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
233 |
- <!-- Download and extract the package --> |
234 |
- <local name="temp.file"/> |
235 |
- <mkdir dir="${base.path}"/> |
236 |
-@@ -3132,7 +3143,7 @@ skip.installer property in build.properties" /> |
237 |
- <delete file="${temp.file}.tar.gz"/> |
238 |
- </target> |
239 |
- |
240 |
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> |
241 |
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> |
242 |
- <!-- Download and extract the package from the two alternative locations --> |
243 |
- <local name="temp.file"/> |
244 |
- <mkdir dir="${base.path}"/> |
245 |
-@@ -3157,7 +3168,7 @@ skip.installer property in build.properties" /> |
246 |
- <delete file="${temp.file}.tar.gz"/> |
247 |
- </target> |
248 |
- |
249 |
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
250 |
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
251 |
- <!-- Download and extract the package --> |
252 |
- <local name="temp.file"/> |
253 |
- <mkdir dir="${base.path}"/> |
254 |
-@@ -3173,7 +3184,7 @@ skip.installer property in build.properties" /> |
255 |
- <delete file="${temp.file}"/> |
256 |
- </target> |
257 |
- |
258 |
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> |
259 |
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> |
260 |
- <!-- Download and extract the package from the two alternative locations --> |
261 |
- <local name="temp.file"/> |
262 |
- <mkdir dir="${base.path}"/> |
263 |
-@@ -3197,7 +3208,7 @@ skip.installer property in build.properties" /> |
264 |
- <delete file="${temp.file}"/> |
265 |
- </target> |
266 |
- |
267 |
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
268 |
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
269 |
- <!-- Download the file --> |
270 |
- <local name="temp.file"/> |
271 |
- <mkdir dir="${base.path}"/> |
272 |
-@@ -3212,7 +3223,7 @@ skip.installer property in build.properties" /> |
273 |
- <move file="${temp.file}" tofile="${destfile}"/> |
274 |
- </target> |
275 |
- |
276 |
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> |
277 |
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> |
278 |
- <!-- Download the file from the two alternative locations --> |
279 |
- <local name="temp.file"/> |
280 |
- <mkdir dir="${base.path}"/> |
281 |
-@@ -3240,7 +3251,7 @@ skip.installer property in build.properties" /> |
282 |
- <move file="${temp.file}" tofile="${destfile}"/> |
283 |
- </target> |
284 |
- |
285 |
-- <target name="trydownload.check" depends="setproxy"> |
286 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
287 |
- <condition property="trydownload.run"> |
288 |
- <and> |
289 |
- <not> |
290 |
-@@ -3251,7 +3262,7 @@ skip.installer property in build.properties" /> |
291 |
- </condition> |
292 |
- </target> |
293 |
- |
294 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
295 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
296 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
297 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
298 |
- </target> |
299 |
-@@ -3262,7 +3273,7 @@ skip.installer property in build.properties" /> |
300 |
- |
301 |
- <target name="ide-eclipse" |
302 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
303 |
-- description="Prepares the source tree to be built in Eclipse"> |
304 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
305 |
- |
306 |
- <!-- Copy the sample project files into the root directory --> |
307 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
308 |
|
309 |
diff --git a/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch |
310 |
deleted file mode 100644 |
311 |
index ab5e5e098a0..00000000000 |
312 |
--- a/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch |
313 |
+++ /dev/null |
314 |
@@ -1,284 +0,0 @@ |
315 |
-diff --git a/build.xml b/build.xml |
316 |
-index 2958ccd..3983182 100644 |
317 |
---- a/build.xml |
318 |
-+++ b/build.xml |
319 |
-@@ -1025,6 +1025,7 @@ |
320 |
- addOSGi="true" /> |
321 |
- |
322 |
- <!-- Servlet 4.0 Implementation JAR File --> |
323 |
-+<!-- |
324 |
- <jarIt jarfile="${servlet-api.jar}" |
325 |
- filesDir="${tomcat.classes}" |
326 |
- filesId="files.servlet-api" |
327 |
-@@ -1032,21 +1033,23 @@ |
328 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
329 |
- license="${tomcat.manifests}/servlet-api.jar.license" |
330 |
- addOSGi="true" /> |
331 |
-- |
332 |
-+--> |
333 |
- <!-- EL Implementation JAR File --> |
334 |
-+<!-- |
335 |
- <jarIt jarfile="${el-api.jar}" |
336 |
- filesDir="${tomcat.classes}" |
337 |
- filesId="files.el-api" |
338 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" |
339 |
- addOSGi="true" /> |
340 |
-- |
341 |
-+--> |
342 |
- <!-- JSP Implementation JAR File --> |
343 |
-+<!-- |
344 |
- <jarIt jarfile="${jsp-api.jar}" |
345 |
- filesDir="${tomcat.classes}" |
346 |
- filesId="files.jsp-api" |
347 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
348 |
- addOSGi="true" /> |
349 |
-- |
350 |
-+--> |
351 |
- <!-- WebSocket API JAR File --> |
352 |
- <jarIt jarfile="${websocket-api.jar}" |
353 |
- filesDir="${tomcat.classes}" |
354 |
-@@ -1159,10 +1162,10 @@ |
355 |
- addOSGi="true" /> |
356 |
- |
357 |
- <!-- Re-packaged Apache Commons DBCP 2--> |
358 |
-- <jarIt jarfile="${tomcat-dbcp.jar}" |
359 |
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" |
360 |
- filesDir="${tomcat.classes}" |
361 |
- filesId="files.tomcat-dbcp" |
362 |
-- addOSGi="true" /> |
363 |
-+ addOSGi="true" /> --> |
364 |
- |
365 |
- <!-- i18n JARs --> |
366 |
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" |
367 |
-@@ -1399,9 +1402,9 @@ |
368 |
- |
369 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
370 |
- description="Default. Builds a working Tomcat instance"> |
371 |
-- |
372 |
-+<!-- |
373 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
374 |
-- |
375 |
-+--> |
376 |
- <!-- Copy scripts --> |
377 |
- <copy todir="${tomcat.build}/bin"> |
378 |
- <fileset dir="bin"> |
379 |
-@@ -1461,7 +1464,7 @@ |
380 |
- <exclude name="${jdt.jar.filename}"/> |
381 |
- </fileset> |
382 |
- </delete> |
383 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
384 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
385 |
- |
386 |
- <!-- Add sources for examples --> |
387 |
- <antcall target="examples-sources" /> |
388 |
-@@ -1504,7 +1507,7 @@ |
389 |
- |
390 |
- </target> |
391 |
- |
392 |
-- <target name="build-tomcat-jdbc" depends="package"> |
393 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
394 |
- <!-- build the jdbc-pool jar and source jar--> |
395 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
396 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
397 |
-@@ -1520,7 +1523,7 @@ |
398 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
399 |
- </target> |
400 |
- |
401 |
-- <target name="build-tomcat-jdbc-src"> |
402 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
403 |
- <!-- build the jdbc-pool source jar--> |
404 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
405 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
406 |
-@@ -1623,9 +1626,11 @@ |
407 |
- |
408 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
409 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
410 |
-+<!-- |
411 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
412 |
- failonerror="false"/> |
413 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
414 |
-+--> |
415 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
416 |
- |
417 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
418 |
-@@ -2208,11 +2213,12 @@ |
419 |
- </copy> |
420 |
- |
421 |
- <!-- Source bundles for native components --> |
422 |
-+<!-- |
423 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
424 |
- file="${tomcat-native.tar.gz}" /> |
425 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
426 |
- file="${commons-daemon.native.src.tgz}" /> |
427 |
-- |
428 |
-+--> |
429 |
- <!-- platform README files --> |
430 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
431 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
432 |
-@@ -2243,6 +2249,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
433 |
- <path location="${ant.core.lib}"/> |
434 |
- </classpath> |
435 |
- </javadoc> |
436 |
-+<!-- |
437 |
- <javadoc packagenames="javax.servlet.*" |
438 |
- excludepackagenames="javax.servlet.jsp.*" |
439 |
- sourcepath="${tomcat.dist}/src/java" |
440 |
-@@ -2307,6 +2314,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
441 |
- <path location="${ant.core.lib}"/> |
442 |
- </classpath> |
443 |
- </javadoc> |
444 |
-+--> |
445 |
- <javadoc packagenames="javax.websocket.*" |
446 |
- sourcepath="${tomcat.dist}/src/java" |
447 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
448 |
-@@ -2369,13 +2377,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
449 |
- <path location="${osgi-annotations.jar}"/> |
450 |
- </classpath> |
451 |
- <link href="../annotationapi"/> |
452 |
-+<!-- |
453 |
- <link href="../servletapi"/> |
454 |
- <link href="../jspapi"/> |
455 |
- <link href="../elapi"/> |
456 |
-+--> |
457 |
- <link href="../websocketapi"/> |
458 |
- <link href="../jaspicapi"/> |
459 |
-+<!-- |
460 |
- <link href="https://docs.oracle.com/javase/8/docs/api/"/> |
461 |
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/> |
462 |
-+--> |
463 |
- <packageset dir="${tomcat.dist}/src/java/"> |
464 |
- <include name="org/**"/> |
465 |
- <exclude name="org/apache/el/parser/**"/> |
466 |
-@@ -3148,7 +3160,7 @@ skip.installer property in build.properties" /> |
467 |
- |
468 |
- <target name="download-compile" |
469 |
- description="Download components necessary to compile" |
470 |
-- depends="setup-bnd"> |
471 |
-+ depends="setup-bnd" unless="noget"> |
472 |
- |
473 |
- <!-- Download Commons Daemon --> |
474 |
- <antcall target="downloadgz-2"> |
475 |
-@@ -3192,7 +3204,7 @@ skip.installer property in build.properties" /> |
476 |
- </target> |
477 |
- |
478 |
- <target name="download-test-compile" |
479 |
-- description="Download additional components for the tests" > |
480 |
-+ description="Download additional components for the tests" unless="noget"> |
481 |
- |
482 |
- <antcall target="downloadfile"> |
483 |
- <param name="sourcefile" value="${junit.loc}"/> |
484 |
-@@ -3270,7 +3282,7 @@ skip.installer property in build.properties" /> |
485 |
- </target> |
486 |
- |
487 |
- <target name="download-dist" |
488 |
-- description="Download additional components for a distribution" > |
489 |
-+ description="Download additional components for a distribution" unless="noget"> |
490 |
- |
491 |
- <antcall target="downloadfile-2"> |
492 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
493 |
-@@ -3325,13 +3337,13 @@ skip.installer property in build.properties" /> |
494 |
- |
495 |
- <!-- =============== Utility Targets to support downloads ================ --> |
496 |
- |
497 |
-- <target name="setproxy" if="${proxy.use}"> |
498 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
499 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
500 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
501 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
502 |
- </target> |
503 |
- |
504 |
-- <target name="testexist"> |
505 |
-+ <target name="testexist" unless="noget"> |
506 |
- <echo message="Testing for ${destfile}"/> |
507 |
- <available file="${destfile}" property="exist"/> |
508 |
- </target> |
509 |
-@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" /> |
510 |
- </sequential> |
511 |
- </macrodef> |
512 |
- |
513 |
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
514 |
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
515 |
- <!-- Download and extract the package --> |
516 |
- <local name="temp.file"/> |
517 |
- <mkdir dir="${base.path}"/> |
518 |
-@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" /> |
519 |
- <delete file="${temp.file}.tar.gz"/> |
520 |
- </target> |
521 |
- |
522 |
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> |
523 |
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> |
524 |
- <!-- Download and extract the package from the two alternative locations --> |
525 |
- <local name="temp.file"/> |
526 |
- <mkdir dir="${base.path}"/> |
527 |
-@@ -3495,7 +3507,7 @@ skip.installer property in build.properties" /> |
528 |
- <delete file="${temp.file}.tar.gz"/> |
529 |
- </target> |
530 |
- |
531 |
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
532 |
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
533 |
- <!-- Download and extract the package --> |
534 |
- <local name="temp.file"/> |
535 |
- <mkdir dir="${base.path}"/> |
536 |
-@@ -3511,7 +3523,7 @@ skip.installer property in build.properties" /> |
537 |
- <delete file="${temp.file}"/> |
538 |
- </target> |
539 |
- |
540 |
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> |
541 |
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> |
542 |
- <!-- Download and extract the package from the two alternative locations --> |
543 |
- <local name="temp.file"/> |
544 |
- <mkdir dir="${base.path}"/> |
545 |
-@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" /> |
546 |
- <delete file="${temp.file}"/> |
547 |
- </target> |
548 |
- |
549 |
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> |
550 |
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> |
551 |
- <!-- Download the file --> |
552 |
- <local name="temp.file"/> |
553 |
- <mkdir dir="${base.path}"/> |
554 |
-@@ -3550,7 +3562,7 @@ skip.installer property in build.properties" /> |
555 |
- <move file="${temp.file}" tofile="${destfile}"/> |
556 |
- </target> |
557 |
- |
558 |
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> |
559 |
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> |
560 |
- <!-- Download the file from the two alternative locations --> |
561 |
- <local name="temp.file"/> |
562 |
- <mkdir dir="${base.path}"/> |
563 |
-@@ -3578,7 +3590,7 @@ skip.installer property in build.properties" /> |
564 |
- <move file="${temp.file}" tofile="${destfile}"/> |
565 |
- </target> |
566 |
- |
567 |
-- <target name="trydownload.check" depends="setproxy"> |
568 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
569 |
- <condition property="trydownload.run"> |
570 |
- <and> |
571 |
- <not> |
572 |
-@@ -3589,7 +3601,7 @@ skip.installer property in build.properties" /> |
573 |
- </condition> |
574 |
- </target> |
575 |
- |
576 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
577 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
578 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
579 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
580 |
- </target> |
581 |
-@@ -3600,7 +3612,7 @@ skip.installer property in build.properties" /> |
582 |
- |
583 |
- <target name="ide-eclipse" |
584 |
- depends="download-compile, download-test-compile" |
585 |
-- description="Prepares the source tree to be built in Eclipse"> |
586 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
587 |
- |
588 |
- <!-- Copy the sample project files into the root directory --> |
589 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
590 |
-@@ -3618,7 +3630,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho |
591 |
- |
592 |
- <target name="ide-intellij" |
593 |
- depends="download-compile, download-test-compile" |
594 |
-- description="Creates project directory .idea for IntelliJ IDEA"> |
595 |
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> |
596 |
- |
597 |
- <copy todir="${tomcat.home}/.idea"> |
598 |
- <fileset dir="${tomcat.home}/res/ide-support/idea"/> |
599 |
|
600 |
diff --git a/www-servers/tomcat/tomcat-10.0.5.ebuild b/www-servers/tomcat/tomcat-10.0.5.ebuild |
601 |
deleted file mode 100644 |
602 |
index d66b5ff3679..00000000000 |
603 |
--- a/www-servers/tomcat/tomcat-10.0.5.ebuild |
604 |
+++ /dev/null |
605 |
@@ -1,192 +0,0 @@ |
606 |
-# Copyright 1999-2021 Gentoo Authors |
607 |
-# Distributed under the terms of the GNU General Public License v2 |
608 |
- |
609 |
-EAPI=7 |
610 |
- |
611 |
-JAVA_PKG_IUSE="doc source test" |
612 |
- |
613 |
-inherit java-pkg-2 java-ant-2 prefix |
614 |
- |
615 |
-MY_P="apache-${PN}-${PV}-src" |
616 |
- |
617 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
618 |
-# See bugs #203080 and #676116 |
619 |
-BND_VERSION="5.1.1" |
620 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
621 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
622 |
- |
623 |
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
624 |
-HOMEPAGE="https://tomcat.apache.org/" |
625 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
626 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
627 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
628 |
- |
629 |
-LICENSE="Apache-2.0" |
630 |
-SLOT="10" |
631 |
-KEYWORDS="~amd64 ~amd64-linux" |
632 |
-IUSE="extra-webapps" |
633 |
- |
634 |
-RESTRICT="test" # can we run them on a production system? |
635 |
- |
636 |
-ECJ_SLOT="4.15" |
637 |
-SAPI_SLOT="5.0" |
638 |
- |
639 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
640 |
- dev-java/glassfish-xmlrpc-api:0 |
641 |
- dev-java/jakartaee-migration:0 |
642 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
643 |
- dev-java/wsdl4j:0" |
644 |
-RDEPEND="${COMMON_DEP} |
645 |
- acct-group/tomcat |
646 |
- acct-user/tomcat |
647 |
- virtual/jre" |
648 |
-DEPEND="${COMMON_DEP} |
649 |
- app-admin/pwgen |
650 |
- dev-java/ant-core |
651 |
- virtual/jdk:1.8 |
652 |
- test? ( |
653 |
- dev-java/ant-junit:0 |
654 |
- dev-java/easymock:3.2 |
655 |
- )" |
656 |
- |
657 |
-S=${WORKDIR}/${MY_P} |
658 |
- |
659 |
-PATCHES=( |
660 |
- "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch" |
661 |
-) |
662 |
- |
663 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
664 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
665 |
-BND_JAR="${BND_HOME}/${BND}" |
666 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
667 |
- |
668 |
-src_unpack() { |
669 |
- unpack ${MY_P}.tar.gz |
670 |
- |
671 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
672 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
673 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
674 |
-} |
675 |
- |
676 |
-src_prepare() { |
677 |
- default |
678 |
- |
679 |
- find -name '*.jar' -type f -delete -print || die |
680 |
- |
681 |
- # Remove bundled servlet-api |
682 |
- rm -rv java/jakarta/{el,servlet} || die |
683 |
- |
684 |
- eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch" |
685 |
- |
686 |
- # For use of catalina.sh in netbeans |
687 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
688 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
689 |
- bin/catalina.sh || die |
690 |
- |
691 |
- java-pkg-2_src_prepare |
692 |
-} |
693 |
- |
694 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
695 |
- |
696 |
-EANT_BUILD_TARGET="deploy" |
697 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
698 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
699 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
700 |
-EANT_NEEDS_TOOLS="true" |
701 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
702 |
- |
703 |
-# revisions of the scripts |
704 |
-IM_REV="-r2" |
705 |
-INIT_REV="-r1" |
706 |
- |
707 |
-src_configure() { |
708 |
- java-ant-2_src_configure |
709 |
- |
710 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
711 |
-} |
712 |
- |
713 |
-src_compile() { |
714 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
715 |
- LC_ALL=C java-pkg-2_src_compile |
716 |
-} |
717 |
- |
718 |
-src_test() { |
719 |
- java-pkg-2_src_test |
720 |
-} |
721 |
- |
722 |
-src_install() { |
723 |
- local dest="/usr/share/${PN}-${SLOT}" |
724 |
- |
725 |
- java-pkg_jarinto "${dest}"/bin |
726 |
- java-pkg_dojar output/build/bin/*.jar |
727 |
- exeinto "${dest}"/bin |
728 |
- doexe output/build/bin/*.sh |
729 |
- |
730 |
- java-pkg_jarinto "${dest}"/lib |
731 |
- java-pkg_dojar output/build/lib/*.jar |
732 |
- |
733 |
- dodoc RELEASE-NOTES RUNNING.txt |
734 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
735 |
- use source && java-pkg_dosrc java/* |
736 |
- |
737 |
- ### Webapps ### |
738 |
- |
739 |
- # add missing docBase |
740 |
- local apps="host-manager manager" |
741 |
- for app in ${apps}; do |
742 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
743 |
- output/build/webapps/${app}/META-INF/context.xml || die |
744 |
- done |
745 |
- |
746 |
- insinto "${dest}"/webapps |
747 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
748 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
749 |
- |
750 |
- ### Config ### |
751 |
- |
752 |
- # create "logs" directory in $CATALINA_BASE |
753 |
- # and set correct perms, see #458890 |
754 |
- dodir "${dest}"/logs |
755 |
- fperms 0750 "${dest}"/logs |
756 |
- |
757 |
- # replace the default pw with a random one, see #92281 |
758 |
- local randpw="$(pwgen -s -B 15 1)" |
759 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
760 |
- |
761 |
- # prepend gentoo.classpath to common.loader, see #453212 |
762 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
763 |
- |
764 |
- insinto "${dest}" |
765 |
- doins -r output/build/conf |
766 |
- |
767 |
- ### rc ### |
768 |
- |
769 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
770 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
771 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
772 |
- |
773 |
- insinto "${dest}"/gentoo |
774 |
- doins "${T}"/tomcat.conf |
775 |
- exeinto "${dest}"/gentoo |
776 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
777 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
778 |
-} |
779 |
- |
780 |
-pkg_postinst() { |
781 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
782 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
783 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
784 |
- |
785 |
- elog "To manage Tomcat instances, run:" |
786 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
787 |
- |
788 |
- ewarn "Please note that since version 10 the primary package for all implemented APIs" |
789 |
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
790 |
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
791 |
- |
792 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
793 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
794 |
- |
795 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
796 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
797 |
-} |
798 |
|
799 |
diff --git a/www-servers/tomcat/tomcat-8.5.65.ebuild b/www-servers/tomcat/tomcat-8.5.65.ebuild |
800 |
deleted file mode 100644 |
801 |
index 047eef551c6..00000000000 |
802 |
--- a/www-servers/tomcat/tomcat-8.5.65.ebuild |
803 |
+++ /dev/null |
804 |
@@ -1,159 +0,0 @@ |
805 |
-# Copyright 1999-2021 Gentoo Authors |
806 |
-# Distributed under the terms of the GNU General Public License v2 |
807 |
- |
808 |
-EAPI=7 |
809 |
- |
810 |
-JAVA_PKG_IUSE="doc source test" |
811 |
- |
812 |
-inherit java-pkg-2 java-ant-2 prefix |
813 |
- |
814 |
-MY_P="apache-${P}-src" |
815 |
- |
816 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
817 |
-HOMEPAGE="https://tomcat.apache.org/" |
818 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
819 |
- |
820 |
-LICENSE="Apache-2.0" |
821 |
-SLOT="8.5" |
822 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
823 |
-IUSE="extra-webapps" |
824 |
- |
825 |
-RESTRICT="test" # can we run them on a production system? |
826 |
- |
827 |
-ECJ_SLOT="4.5" |
828 |
-SAPI_SLOT="3.1" |
829 |
- |
830 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
831 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
832 |
-RDEPEND="${COMMON_DEP} |
833 |
- acct-group/tomcat |
834 |
- acct-user/tomcat |
835 |
- virtual/jre" |
836 |
-DEPEND="${COMMON_DEP} |
837 |
- app-admin/pwgen |
838 |
- dev-java/ant-core |
839 |
- virtual/jdk:1.8 |
840 |
- doc? ( |
841 |
- dev-java/glassfish-xmlrpc-api:0 |
842 |
- dev-java/wsdl4j:0 |
843 |
- ) |
844 |
- test? ( |
845 |
- >=dev-java/ant-junit-1.9:0 |
846 |
- dev-java/easymock:3.2 |
847 |
- )" |
848 |
- |
849 |
-S=${WORKDIR}/${MY_P} |
850 |
- |
851 |
-src_prepare() { |
852 |
- default |
853 |
- |
854 |
- find -name '*.jar' -type f -delete -print || die |
855 |
- |
856 |
- # Remove bundled servlet-api |
857 |
- rm -rv java/javax/{el,servlet} || die |
858 |
- |
859 |
- eapply "${FILESDIR}/${PN}-8.5.65-build.xml.patch" |
860 |
- |
861 |
- # For use of catalina.sh in netbeans |
862 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
863 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
864 |
- bin/catalina.sh || die |
865 |
- |
866 |
- java-pkg-2_src_prepare |
867 |
-} |
868 |
- |
869 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
870 |
- |
871 |
-EANT_BUILD_TARGET="deploy" |
872 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
873 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
874 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
875 |
-EANT_NEEDS_TOOLS="true" |
876 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
877 |
- |
878 |
-# revisions of the scripts |
879 |
-IM_REV="-r2" |
880 |
-INIT_REV="-r1" |
881 |
- |
882 |
-src_compile() { |
883 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
884 |
- use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)" |
885 |
- LC_ALL=C java-pkg-2_src_compile |
886 |
-} |
887 |
- |
888 |
-src_test() { |
889 |
- java-pkg-2_src_test |
890 |
-} |
891 |
- |
892 |
-src_install() { |
893 |
- local dest="/usr/share/${PN}-${SLOT}" |
894 |
- |
895 |
- java-pkg_jarinto "${dest}"/bin |
896 |
- java-pkg_dojar output/build/bin/*.jar |
897 |
- exeinto "${dest}"/bin |
898 |
- doexe output/build/bin/*.sh |
899 |
- |
900 |
- java-pkg_jarinto "${dest}"/lib |
901 |
- java-pkg_dojar output/build/lib/*.jar |
902 |
- |
903 |
- dodoc RELEASE-NOTES RUNNING.txt |
904 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
905 |
- use source && java-pkg_dosrc java/* |
906 |
- |
907 |
- ### Webapps ### |
908 |
- |
909 |
- # add missing docBase |
910 |
- local apps="host-manager manager" |
911 |
- for app in ${apps}; do |
912 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
913 |
- output/build/webapps/${app}/META-INF/context.xml || die |
914 |
- done |
915 |
- |
916 |
- insinto "${dest}"/webapps |
917 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
918 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
919 |
- |
920 |
- ### Config ### |
921 |
- |
922 |
- # create "logs" directory in $CATALINA_BASE |
923 |
- # and set correct perms, see #458890 |
924 |
- dodir "${dest}"/logs |
925 |
- fperms 0750 "${dest}"/logs |
926 |
- |
927 |
- # replace the default pw with a random one, see #92281 |
928 |
- local randpw="$(pwgen -s -B 15 1)" |
929 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
930 |
- |
931 |
- # prepend gentoo.classpath to common.loader, see #453212 |
932 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
933 |
- |
934 |
- insinto "${dest}" |
935 |
- doins -r output/build/conf |
936 |
- |
937 |
- ### rc ### |
938 |
- |
939 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
940 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
941 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
942 |
- |
943 |
- insinto "${dest}"/gentoo |
944 |
- doins "${T}"/tomcat.conf |
945 |
- exeinto "${dest}"/gentoo |
946 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
947 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
948 |
-} |
949 |
- |
950 |
-pkg_postinst() { |
951 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
952 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
953 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
954 |
- |
955 |
- elog "To manage Tomcat instances, run:" |
956 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
957 |
- |
958 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
959 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
960 |
- |
961 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
962 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
963 |
-} |
964 |
|
965 |
diff --git a/www-servers/tomcat/tomcat-9.0.45.ebuild b/www-servers/tomcat/tomcat-9.0.45.ebuild |
966 |
deleted file mode 100644 |
967 |
index cda55f1d652..00000000000 |
968 |
--- a/www-servers/tomcat/tomcat-9.0.45.ebuild |
969 |
+++ /dev/null |
970 |
@@ -1,187 +0,0 @@ |
971 |
-# Copyright 1999-2021 Gentoo Authors |
972 |
-# Distributed under the terms of the GNU General Public License v2 |
973 |
- |
974 |
-EAPI=7 |
975 |
- |
976 |
-JAVA_PKG_IUSE="doc source test" |
977 |
- |
978 |
-inherit java-pkg-2 java-ant-2 prefix |
979 |
- |
980 |
-MY_P="apache-${PN}-${PV}-src" |
981 |
- |
982 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
983 |
-# See bugs #203080 and #676116 |
984 |
-BND_VERSION="5.1.1" |
985 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
986 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
987 |
- |
988 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
989 |
-HOMEPAGE="https://tomcat.apache.org/" |
990 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
991 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
992 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
993 |
- |
994 |
-LICENSE="Apache-2.0" |
995 |
-SLOT="9" |
996 |
-KEYWORDS="~amd64 ~x86 ~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.15" |
1002 |
-SAPI_SLOT="4.0" |
1003 |
- |
1004 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
1005 |
- dev-java/glassfish-xmlrpc-api:0 |
1006 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
1007 |
- dev-java/wsdl4j:0" |
1008 |
-RDEPEND="${COMMON_DEP} |
1009 |
- acct-group/tomcat |
1010 |
- acct-user/tomcat |
1011 |
- virtual/jre" |
1012 |
-DEPEND="${COMMON_DEP} |
1013 |
- app-admin/pwgen |
1014 |
- >=dev-java/ant-core-1.9.13 |
1015 |
- virtual/jdk:1.8 |
1016 |
- test? ( |
1017 |
- >=dev-java/ant-junit-1.9:0 |
1018 |
- dev-java/easymock:3.2 |
1019 |
- )" |
1020 |
- |
1021 |
-S=${WORKDIR}/${MY_P} |
1022 |
- |
1023 |
-PATCHES=( |
1024 |
- "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch" |
1025 |
-) |
1026 |
- |
1027 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
1028 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
1029 |
-BND_JAR="${BND_HOME}/${BND}" |
1030 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
1031 |
- |
1032 |
-src_unpack() { |
1033 |
- unpack ${MY_P}.tar.gz |
1034 |
- |
1035 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
1036 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
1037 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
1038 |
-} |
1039 |
- |
1040 |
-src_prepare() { |
1041 |
- default |
1042 |
- |
1043 |
- find -name '*.jar' -type f -delete -print || die |
1044 |
- |
1045 |
- # Remove bundled servlet-api |
1046 |
- rm -rv java/javax/{el,servlet} || die |
1047 |
- |
1048 |
- eapply "${FILESDIR}/${PN}-9.0.45-build.xml.patch" |
1049 |
- |
1050 |
- # For use of catalina.sh in netbeans |
1051 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
1052 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
1053 |
- bin/catalina.sh || die |
1054 |
- |
1055 |
- java-pkg-2_src_prepare |
1056 |
-} |
1057 |
- |
1058 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
1059 |
- |
1060 |
-EANT_BUILD_TARGET="deploy" |
1061 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
1062 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
1063 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
1064 |
-EANT_NEEDS_TOOLS="true" |
1065 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
1066 |
- |
1067 |
-# revisions of the scripts |
1068 |
-IM_REV="-r2" |
1069 |
-INIT_REV="-r1" |
1070 |
- |
1071 |
-src_configure() { |
1072 |
- java-ant-2_src_configure |
1073 |
- |
1074 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
1075 |
-} |
1076 |
- |
1077 |
-src_compile() { |
1078 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
1079 |
- LC_ALL=C java-pkg-2_src_compile |
1080 |
-} |
1081 |
- |
1082 |
-src_test() { |
1083 |
- java-pkg-2_src_test |
1084 |
-} |
1085 |
- |
1086 |
-src_install() { |
1087 |
- local dest="/usr/share/${PN}-${SLOT}" |
1088 |
- |
1089 |
- java-pkg_jarinto "${dest}"/bin |
1090 |
- java-pkg_dojar output/build/bin/*.jar |
1091 |
- exeinto "${dest}"/bin |
1092 |
- doexe output/build/bin/*.sh |
1093 |
- |
1094 |
- java-pkg_jarinto "${dest}"/lib |
1095 |
- java-pkg_dojar output/build/lib/*.jar |
1096 |
- |
1097 |
- dodoc RELEASE-NOTES RUNNING.txt |
1098 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
1099 |
- use source && java-pkg_dosrc java/* |
1100 |
- |
1101 |
- ### Webapps ### |
1102 |
- |
1103 |
- # add missing docBase |
1104 |
- local apps="host-manager manager" |
1105 |
- for app in ${apps}; do |
1106 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
1107 |
- output/build/webapps/${app}/META-INF/context.xml || die |
1108 |
- done |
1109 |
- |
1110 |
- insinto "${dest}"/webapps |
1111 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
1112 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
1113 |
- |
1114 |
- ### Config ### |
1115 |
- |
1116 |
- # create "logs" directory in $CATALINA_BASE |
1117 |
- # and set correct perms, see #458890 |
1118 |
- dodir "${dest}"/logs |
1119 |
- fperms 0750 "${dest}"/logs |
1120 |
- |
1121 |
- # replace the default pw with a random one, see #92281 |
1122 |
- local randpw="$(pwgen -s -B 15 1)" |
1123 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
1124 |
- |
1125 |
- # prepend gentoo.classpath to common.loader, see #453212 |
1126 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
1127 |
- |
1128 |
- insinto "${dest}" |
1129 |
- doins -r output/build/conf |
1130 |
- |
1131 |
- ### rc ### |
1132 |
- |
1133 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
1134 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
1135 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
1136 |
- |
1137 |
- insinto "${dest}"/gentoo |
1138 |
- doins "${T}"/tomcat.conf |
1139 |
- exeinto "${dest}"/gentoo |
1140 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
1141 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
1142 |
-} |
1143 |
- |
1144 |
-pkg_postinst() { |
1145 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
1146 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
1147 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
1148 |
- |
1149 |
- elog "To manage Tomcat instances, run:" |
1150 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
1151 |
- |
1152 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
1153 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
1154 |
- |
1155 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
1156 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
1157 |
-} |