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