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