1 |
commit: 0ef8f7bf8438ad24f113764fc2572a117f1ef5ad |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 13 14:23:57 2018 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 13 17:23:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef8f7bf |
7 |
|
8 |
www-servers/tomcat: cleaned old versions of tomcat |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
www-servers/tomcat/Manifest | 2 - |
13 |
.../tomcat/files/tomcat-8.0.47-build.xml.patch | 258 --------------------- |
14 |
.../tomcat/files/tomcat-8.5.23-build.xml.patch | 249 -------------------- |
15 |
www-servers/tomcat/tomcat-8.0.47.ebuild | 157 ------------- |
16 |
www-servers/tomcat/tomcat-8.5.23.ebuild | 157 ------------- |
17 |
5 files changed, 823 deletions(-) |
18 |
|
19 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
20 |
index 18f8fa8c5e0..d464d1d02c2 100644 |
21 |
--- a/www-servers/tomcat/Manifest |
22 |
+++ b/www-servers/tomcat/Manifest |
23 |
@@ -1,9 +1,7 @@ |
24 |
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db |
25 |
DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74 |
26 |
-DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5 SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 |
27 |
DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841 |
28 |
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 |
29 |
-DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef |
30 |
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc |
31 |
DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab |
32 |
DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557 |
33 |
|
34 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch |
35 |
deleted file mode 100644 |
36 |
index b0862aef305..00000000000 |
37 |
--- a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch |
38 |
+++ /dev/null |
39 |
@@ -1,258 +0,0 @@ |
40 |
-diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml |
41 |
-index 6b4465a..ab4008d 100644 |
42 |
---- a/apache-tomcat-8.0.47-src/build.xml |
43 |
-+++ b/apache-tomcat-8.0.47-src/build.xml |
44 |
-@@ -715,24 +715,29 @@ |
45 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
46 |
- |
47 |
- <!-- Servlet 3.1 Implementation JAR File --> |
48 |
-+<!-- |
49 |
- <jarIt jarfile="${servlet-api.jar}" |
50 |
- filesDir="${tomcat.classes}" |
51 |
- filesId="files.servlet-api" |
52 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
53 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
54 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
55 |
-- |
56 |
-+--> |
57 |
- <!-- JSP 2.3 Implementation JAR File --> |
58 |
-+<!-- |
59 |
- <jarIt jarfile="${jsp-api.jar}" |
60 |
- filesDir="${tomcat.classes}" |
61 |
- filesId="files.jsp-api" |
62 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
63 |
-+--> |
64 |
- |
65 |
- <!-- EL 3.0 Implementation JAR File --> |
66 |
-+<!-- |
67 |
- <jarIt jarfile="${el-api.jar}" |
68 |
- filesDir="${tomcat.classes}" |
69 |
- filesId="files.el-api" |
70 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
71 |
-+--> |
72 |
- |
73 |
- <!-- WebSocket 1.1 API JAR File --> |
74 |
- <jarIt jarfile="${websocket-api.jar}" |
75 |
-@@ -1000,14 +1005,14 @@ |
76 |
- |
77 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
78 |
- description="Default. Builds a working Tomcat instance"> |
79 |
-- |
80 |
-+<!-- |
81 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
82 |
- file="${tomcat-native.tar.gz}" /> |
83 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
84 |
- file="${commons-daemon.native.src.tgz}" /> |
85 |
- |
86 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
87 |
-- |
88 |
-+--> |
89 |
- <!-- Copy scripts --> |
90 |
- <copy todir="${tomcat.build}/bin"> |
91 |
- <fileset dir="bin"> |
92 |
-@@ -1067,7 +1072,7 @@ |
93 |
- <exclude name="${jdt.jar.filename}"/> |
94 |
- </fileset> |
95 |
- </delete> |
96 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
97 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
98 |
- |
99 |
- <!-- Add sources for examples --> |
100 |
- <antcall target="examples-sources" /> |
101 |
-@@ -1101,7 +1106,7 @@ |
102 |
- </javac> |
103 |
- </target> |
104 |
- |
105 |
-- <target name="build-tomcat-jdbc" depends="package"> |
106 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
107 |
- <!-- build the jdbc-pool jar and source jar--> |
108 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
109 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
110 |
-@@ -1116,7 +1121,7 @@ |
111 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
112 |
- </target> |
113 |
- |
114 |
-- <target name="build-tomcat-jdbc-src"> |
115 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
116 |
- <!-- build the jdbc-pool source jar--> |
117 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
118 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
119 |
-@@ -1220,9 +1225,11 @@ |
120 |
- |
121 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
122 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
123 |
-+<!-- |
124 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
125 |
- failonerror="false"/> |
126 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
127 |
-+--> |
128 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
129 |
- |
130 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
131 |
-@@ -1613,7 +1620,7 @@ |
132 |
- |
133 |
- <target name="extras-commons-logging-prepare" |
134 |
- depends="extras-prepare" |
135 |
-- description="Prepare to build web services extras package"> |
136 |
-+ description="Prepare to build web services extras package" unless="noget"> |
137 |
- |
138 |
- <antcall target="downloadfile-2"> |
139 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
140 |
-@@ -1752,7 +1759,7 @@ |
141 |
- |
142 |
- <target name="extras-webservices-prepare" |
143 |
- depends="extras-prepare" |
144 |
-- description="Prepare to build web services extras package"> |
145 |
-+ description="Prepare to build web services extras package" unless="noget"> |
146 |
- |
147 |
- <antcall target="downloadfile"> |
148 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
149 |
-@@ -1947,6 +1954,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
150 |
- |
151 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
152 |
- description="Create the Tomcat javadoc" > |
153 |
-+<!-- |
154 |
- <javadoc packagenames="javax.servlet.*" |
155 |
- excludepackagenames="javax.servlet.jsp.*" |
156 |
- sourcepath="${tomcat.dist}/src/java" |
157 |
-@@ -2008,6 +2016,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
158 |
- <path location="${ant.core.lib}"/> |
159 |
- </classpath> |
160 |
- </javadoc> |
161 |
-+--> |
162 |
- <javadoc packagenames="javax.websocket.*" |
163 |
- sourcepath="${tomcat.dist}/src/java" |
164 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
165 |
-@@ -2046,9 +2055,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
166 |
- <path refid="tomcat.webservices.classpath"/> |
167 |
- <path location="${ant.core.lib}"/> |
168 |
- </classpath> |
169 |
-+<!-- |
170 |
- <link href="../servletapi"/> |
171 |
- <link href="../jspapi"/> |
172 |
- <link href="../elapi"/> |
173 |
-+--> |
174 |
- <link href="../websocketapi"/> |
175 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
176 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
177 |
-@@ -2781,7 +2792,7 @@ skip.installer property in build.properties" /> |
178 |
- </target> |
179 |
- |
180 |
- <target name="download-compile" |
181 |
-- description="Download (and build) components necessary to compile" > |
182 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
183 |
- |
184 |
- <antcall target="downloadfile-2"> |
185 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
186 |
-@@ -2815,7 +2826,7 @@ skip.installer property in build.properties" /> |
187 |
- </target> |
188 |
- |
189 |
- <target name="download-test-compile" |
190 |
-- description="Download additional components for the tests" > |
191 |
-+ description="Download additional components for the tests" unless="noget"> |
192 |
- |
193 |
- <antcall target="downloadfile"> |
194 |
- <param name="sourcefile" value="${junit.loc}"/> |
195 |
-@@ -2872,7 +2883,7 @@ skip.installer property in build.properties" /> |
196 |
- </target> |
197 |
- |
198 |
- <target name="download-dist" |
199 |
-- description="Download additional components for a distribution" > |
200 |
-+ description="Download additional components for a distribution" unless="noget"> |
201 |
- |
202 |
- <antcall target="downloadzip-2"> |
203 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
204 |
-@@ -2898,18 +2909,18 @@ skip.installer property in build.properties" /> |
205 |
- |
206 |
- <!-- =============== Utility Targets to support downloads ================ --> |
207 |
- |
208 |
-- <target name="setproxy" if="${proxy.use}"> |
209 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
210 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
211 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
212 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
213 |
- </target> |
214 |
- |
215 |
-- <target name="testexist"> |
216 |
-+ <target name="testexist" unless="noget"> |
217 |
- <echo message="Testing for ${destfile}"/> |
218 |
- <available file="${destfile}" property="exist"/> |
219 |
- </target> |
220 |
- |
221 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
222 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
223 |
- <!-- Download and extract the package --> |
224 |
- <local name="temp.file"/> |
225 |
- <mkdir dir="${base.path}"/> |
226 |
-@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" /> |
227 |
- <delete file="${temp.file}.tar.gz"/> |
228 |
- </target> |
229 |
- |
230 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
231 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
232 |
- <!-- Download and extract the package from the two alternative locations --> |
233 |
- <local name="temp.file"/> |
234 |
- <mkdir dir="${base.path}"/> |
235 |
-@@ -2940,7 +2951,7 @@ skip.installer property in build.properties" /> |
236 |
- <delete file="${temp.file}.tar.gz"/> |
237 |
- </target> |
238 |
- |
239 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
240 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
241 |
- <!-- Download and extract the package --> |
242 |
- <local name="temp.file"/> |
243 |
- <mkdir dir="${base.path}"/> |
244 |
-@@ -2951,7 +2962,7 @@ skip.installer property in build.properties" /> |
245 |
- <delete file="${temp.file}"/> |
246 |
- </target> |
247 |
- |
248 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
249 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
250 |
- <!-- Download and extract the package from the two alternative locations --> |
251 |
- <local name="temp.file"/> |
252 |
- <mkdir dir="${base.path}"/> |
253 |
-@@ -2969,7 +2980,7 @@ skip.installer property in build.properties" /> |
254 |
- <delete file="${temp.file}"/> |
255 |
- </target> |
256 |
- |
257 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
258 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
259 |
- <!-- Download the file --> |
260 |
- <local name="temp.file"/> |
261 |
- <mkdir dir="${base.path}"/> |
262 |
-@@ -2979,7 +2990,7 @@ skip.installer property in build.properties" /> |
263 |
- <move file="${temp.file}" tofile="${destfile}"/> |
264 |
- </target> |
265 |
- |
266 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
267 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
268 |
- <!-- Download the file from the two alternative locations --> |
269 |
- <local name="temp.file"/> |
270 |
- <mkdir dir="${base.path}"/> |
271 |
-@@ -3002,7 +3013,7 @@ skip.installer property in build.properties" /> |
272 |
- <move file="${temp.file}" tofile="${destfile}"/> |
273 |
- </target> |
274 |
- |
275 |
-- <target name="trydownload.check" depends="setproxy"> |
276 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
277 |
- <condition property="trydownload.run"> |
278 |
- <and> |
279 |
- <not> |
280 |
-@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" /> |
281 |
- </condition> |
282 |
- </target> |
283 |
- |
284 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
285 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
286 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
287 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
288 |
- </target> |
289 |
-@@ -3024,7 +3035,7 @@ skip.installer property in build.properties" /> |
290 |
- |
291 |
- <target name="ide-eclipse" |
292 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
293 |
-- description="Prepares the source tree to be built in Eclipse"> |
294 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
295 |
- |
296 |
- <!-- Copy the sample project files into the root directory --> |
297 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
298 |
|
299 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch |
300 |
deleted file mode 100644 |
301 |
index d83440c0c4d..00000000000 |
302 |
--- a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch |
303 |
+++ /dev/null |
304 |
@@ -1,249 +0,0 @@ |
305 |
-diff --git a/apache-tomcat-8.5.23-src/build.xml b/apache-tomcat-8.5.23-src/build.xml |
306 |
-index b1b2666..263800c 100644 |
307 |
---- a/apache-tomcat-8.5.23-src/build.xml |
308 |
-+++ b/apache-tomcat-8.5.23-src/build.xml |
309 |
-@@ -714,24 +714,29 @@ |
310 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
311 |
- |
312 |
- <!-- Servlet 3.1 Implementation JAR File --> |
313 |
-+<!-- |
314 |
- <jarIt jarfile="${servlet-api.jar}" |
315 |
- filesDir="${tomcat.classes}" |
316 |
- filesId="files.servlet-api" |
317 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
318 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
319 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
320 |
-- |
321 |
-+--> |
322 |
- <!-- JSP 2.3 Implementation JAR File --> |
323 |
-+<!-- |
324 |
- <jarIt jarfile="${jsp-api.jar}" |
325 |
- filesDir="${tomcat.classes}" |
326 |
- filesId="files.jsp-api" |
327 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
328 |
-+--> |
329 |
- |
330 |
- <!-- EL 3.0 Implementation JAR File --> |
331 |
-+<!-- |
332 |
- <jarIt jarfile="${el-api.jar}" |
333 |
- filesDir="${tomcat.classes}" |
334 |
- filesId="files.el-api" |
335 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
336 |
-+--> |
337 |
- |
338 |
- <!-- WebSocket 1.1 API JAR File --> |
339 |
- <jarIt jarfile="${websocket-api.jar}" |
340 |
-@@ -1005,14 +1010,14 @@ |
341 |
- |
342 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
343 |
- description="Default. Builds a working Tomcat instance"> |
344 |
-- |
345 |
-+<!-- |
346 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
347 |
- file="${tomcat-native.tar.gz}" /> |
348 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
349 |
- file="${commons-daemon.native.src.tgz}" /> |
350 |
- |
351 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
352 |
-- |
353 |
-+--> |
354 |
- <!-- Copy scripts --> |
355 |
- <copy todir="${tomcat.build}/bin"> |
356 |
- <fileset dir="bin"> |
357 |
-@@ -1072,7 +1077,7 @@ |
358 |
- <exclude name="${jdt.jar.filename}"/> |
359 |
- </fileset> |
360 |
- </delete> |
361 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
362 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
363 |
- |
364 |
- <!-- Add sources for examples --> |
365 |
- <antcall target="examples-sources" /> |
366 |
-@@ -1106,7 +1111,7 @@ |
367 |
- </javac> |
368 |
- </target> |
369 |
- |
370 |
-- <target name="build-tomcat-jdbc" depends="package"> |
371 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
372 |
- <!-- build the jdbc-pool jar and source jar--> |
373 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
374 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
375 |
-@@ -1121,7 +1126,7 @@ |
376 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
377 |
- </target> |
378 |
- |
379 |
-- <target name="build-tomcat-jdbc-src"> |
380 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
381 |
- <!-- build the jdbc-pool source jar--> |
382 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
383 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
384 |
-@@ -1225,9 +1230,11 @@ |
385 |
- |
386 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
387 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
388 |
-+<!-- |
389 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
390 |
- failonerror="false"/> |
391 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
392 |
-+--> |
393 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
394 |
- |
395 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
396 |
-@@ -1608,7 +1615,7 @@ |
397 |
- |
398 |
- <target name="extras-webservices-prepare" |
399 |
- depends="extras-prepare" |
400 |
-- description="Prepare to build web services extras package"> |
401 |
-+ description="Prepare to build web services extras package" unless="noget"> |
402 |
- |
403 |
- <antcall target="downloadfile"> |
404 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
405 |
-@@ -1756,6 +1763,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
406 |
- |
407 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
408 |
- description="Create the Tomcat javadoc" > |
409 |
-+<!-- |
410 |
- <javadoc packagenames="javax.servlet.*" |
411 |
- excludepackagenames="javax.servlet.jsp.*" |
412 |
- sourcepath="${tomcat.dist}/src/java" |
413 |
-@@ -1820,6 +1828,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
414 |
- <path location="${ant.core.lib}"/> |
415 |
- </classpath> |
416 |
- </javadoc> |
417 |
-+--> |
418 |
- <javadoc packagenames="javax.websocket.*" |
419 |
- sourcepath="${tomcat.dist}/src/java" |
420 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
421 |
-@@ -1860,9 +1869,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
422 |
- <path refid="tomcat.webservices.classpath"/> |
423 |
- <path location="${ant.core.lib}"/> |
424 |
- </classpath> |
425 |
-+<!-- |
426 |
- <link href="../servletapi"/> |
427 |
- <link href="../jspapi"/> |
428 |
- <link href="../elapi"/> |
429 |
-+--> |
430 |
- <link href="../websocketapi"/> |
431 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
432 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
433 |
-@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" /> |
434 |
- </target> |
435 |
- |
436 |
- <target name="download-compile" |
437 |
-- description="Download (and build) components necessary to compile" > |
438 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
439 |
- |
440 |
- <antcall target="downloadfile-2"> |
441 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
442 |
-@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" /> |
443 |
- </target> |
444 |
- |
445 |
- <target name="download-test-compile" |
446 |
-- description="Download additional components for the tests" > |
447 |
-+ description="Download additional components for the tests" unless="noget"> |
448 |
- |
449 |
- <antcall target="downloadfile"> |
450 |
- <param name="sourcefile" value="${junit.loc}"/> |
451 |
-@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" /> |
452 |
- </target> |
453 |
- |
454 |
- <target name="download-dist" |
455 |
-- description="Download additional components for a distribution" > |
456 |
-+ description="Download additional components for a distribution" unless="noget"> |
457 |
- |
458 |
- <antcall target="downloadzip-2"> |
459 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
460 |
-@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" /> |
461 |
- |
462 |
- <!-- =============== Utility Targets to support downloads ================ --> |
463 |
- |
464 |
-- <target name="setproxy" if="${proxy.use}"> |
465 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
466 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
467 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
468 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
469 |
- </target> |
470 |
- |
471 |
-- <target name="testexist"> |
472 |
-+ <target name="testexist" unless="noget"> |
473 |
- <echo message="Testing for ${destfile}"/> |
474 |
- <available file="${destfile}" property="exist"/> |
475 |
- </target> |
476 |
- |
477 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
478 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
479 |
- <!-- Download and extract the package --> |
480 |
- <local name="temp.file"/> |
481 |
- <mkdir dir="${base.path}"/> |
482 |
-@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" /> |
483 |
- <delete file="${temp.file}.tar.gz"/> |
484 |
- </target> |
485 |
- |
486 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
487 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
488 |
- <!-- Download and extract the package from the two alternative locations --> |
489 |
- <local name="temp.file"/> |
490 |
- <mkdir dir="${base.path}"/> |
491 |
-@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" /> |
492 |
- <delete file="${temp.file}.tar.gz"/> |
493 |
- </target> |
494 |
- |
495 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
496 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
497 |
- <!-- Download and extract the package --> |
498 |
- <local name="temp.file"/> |
499 |
- <mkdir dir="${base.path}"/> |
500 |
-@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" /> |
501 |
- <delete file="${temp.file}"/> |
502 |
- </target> |
503 |
- |
504 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
505 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
506 |
- <!-- Download and extract the package from the two alternative locations --> |
507 |
- <local name="temp.file"/> |
508 |
- <mkdir dir="${base.path}"/> |
509 |
-@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" /> |
510 |
- <delete file="${temp.file}"/> |
511 |
- </target> |
512 |
- |
513 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
514 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
515 |
- <!-- Download the file --> |
516 |
- <local name="temp.file"/> |
517 |
- <mkdir dir="${base.path}"/> |
518 |
-@@ -2805,7 +2816,7 @@ skip.installer property in build.properties" /> |
519 |
- <move file="${temp.file}" tofile="${destfile}"/> |
520 |
- </target> |
521 |
- |
522 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
523 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
524 |
- <!-- Download the file from the two alternative locations --> |
525 |
- <local name="temp.file"/> |
526 |
- <mkdir dir="${base.path}"/> |
527 |
-@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" /> |
528 |
- <move file="${temp.file}" tofile="${destfile}"/> |
529 |
- </target> |
530 |
- |
531 |
-- <target name="trydownload.check" depends="setproxy"> |
532 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
533 |
- <condition property="trydownload.run"> |
534 |
- <and> |
535 |
- <not> |
536 |
-@@ -2839,7 +2850,7 @@ skip.installer property in build.properties" /> |
537 |
- </condition> |
538 |
- </target> |
539 |
- |
540 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
541 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
542 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
543 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
544 |
- </target> |
545 |
-@@ -2850,7 +2861,7 @@ skip.installer property in build.properties" /> |
546 |
- |
547 |
- <target name="ide-eclipse" |
548 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
549 |
-- description="Prepares the source tree to be built in Eclipse"> |
550 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
551 |
- |
552 |
- <!-- Copy the sample project files into the root directory --> |
553 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
554 |
|
555 |
diff --git a/www-servers/tomcat/tomcat-8.0.47.ebuild b/www-servers/tomcat/tomcat-8.0.47.ebuild |
556 |
deleted file mode 100644 |
557 |
index 0275eef0064..00000000000 |
558 |
--- a/www-servers/tomcat/tomcat-8.0.47.ebuild |
559 |
+++ /dev/null |
560 |
@@ -1,157 +0,0 @@ |
561 |
-# Copyright 1999-2017 Gentoo Foundation |
562 |
-# Distributed under the terms of the GNU General Public License v2 |
563 |
- |
564 |
-EAPI=6 |
565 |
- |
566 |
-JAVA_PKG_IUSE="doc source test" |
567 |
- |
568 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
569 |
- |
570 |
-MY_P="apache-${P}-src" |
571 |
- |
572 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
573 |
-HOMEPAGE="https://tomcat.apache.org/" |
574 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
575 |
- |
576 |
-LICENSE="Apache-2.0" |
577 |
-SLOT="8" |
578 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
579 |
-IUSE="extra-webapps" |
580 |
- |
581 |
-RESTRICT="test" # can we run them on a production system? |
582 |
- |
583 |
-ECJ_SLOT="4.5" |
584 |
-SAPI_SLOT="3.1" |
585 |
- |
586 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
587 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
588 |
-RDEPEND="${COMMON_DEP} |
589 |
- !<dev-java/tomcat-native-1.1.24 |
590 |
- >=virtual/jre-1.7" |
591 |
-DEPEND="${COMMON_DEP} |
592 |
- app-admin/pwgen |
593 |
- >=virtual/jdk-1.7 |
594 |
- test? ( |
595 |
- >=dev-java/ant-junit-1.9:0 |
596 |
- dev-java/easymock:3.2 |
597 |
- )" |
598 |
- |
599 |
-S=${WORKDIR}/${MY_P} |
600 |
- |
601 |
-pkg_setup() { |
602 |
- java-pkg-2_pkg_setup |
603 |
- enewgroup tomcat 265 |
604 |
- enewuser tomcat 265 -1 /dev/null tomcat |
605 |
-} |
606 |
- |
607 |
-src_prepare() { |
608 |
- default |
609 |
- |
610 |
- find -name '*.jar' -type f -delete -print || die |
611 |
- |
612 |
- # Remove bundled servlet-api |
613 |
- rm -rv java/javax/{el,servlet} || die |
614 |
- |
615 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
616 |
- |
617 |
- # For use of catalina.sh in netbeans |
618 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
619 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
620 |
- bin/catalina.sh || die |
621 |
- |
622 |
- java-pkg-2_src_prepare |
623 |
-} |
624 |
- |
625 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
626 |
- |
627 |
-EANT_BUILD_TARGET="deploy" |
628 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
629 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
630 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
631 |
-EANT_NEEDS_TOOLS="true" |
632 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
633 |
- |
634 |
-# revisions of the scripts |
635 |
-IM_REV="-r2" |
636 |
-INIT_REV="-r1" |
637 |
- |
638 |
-src_compile() { |
639 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
640 |
- java-pkg-2_src_compile |
641 |
-} |
642 |
- |
643 |
-src_test() { |
644 |
- java-pkg-2_src_test |
645 |
-} |
646 |
- |
647 |
-src_install() { |
648 |
- local dest="/usr/share/${PN}-${SLOT}" |
649 |
- |
650 |
- java-pkg_jarinto "${dest}"/bin |
651 |
- java-pkg_dojar output/build/bin/*.jar |
652 |
- exeinto "${dest}"/bin |
653 |
- doexe output/build/bin/*.sh |
654 |
- |
655 |
- java-pkg_jarinto "${dest}"/lib |
656 |
- java-pkg_dojar output/build/lib/*.jar |
657 |
- |
658 |
- dodoc RELEASE-NOTES RUNNING.txt |
659 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
660 |
- use source && java-pkg_dosrc java/* |
661 |
- |
662 |
- ### Webapps ### |
663 |
- |
664 |
- # add missing docBase |
665 |
- local apps="host-manager manager" |
666 |
- for app in ${apps}; do |
667 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
668 |
- output/build/webapps/${app}/META-INF/context.xml || die |
669 |
- done |
670 |
- |
671 |
- insinto "${dest}"/webapps |
672 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
673 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
674 |
- |
675 |
- ### Config ### |
676 |
- |
677 |
- # create "logs" directory in $CATALINA_BASE |
678 |
- # and set correct perms, see #458890 |
679 |
- dodir "${dest}"/logs |
680 |
- fperms 0750 "${dest}"/logs |
681 |
- |
682 |
- # replace the default pw with a random one, see #92281 |
683 |
- local randpw="$(pwgen -s -B 15 1)" |
684 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
685 |
- |
686 |
- # prepend gentoo.classpath to common.loader, see #453212 |
687 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
688 |
- |
689 |
- insinto "${dest}" |
690 |
- doins -r output/build/conf |
691 |
- |
692 |
- ### rc ### |
693 |
- |
694 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
695 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
696 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
697 |
- |
698 |
- insinto "${dest}"/gentoo |
699 |
- doins "${T}"/tomcat.conf |
700 |
- exeinto "${dest}"/gentoo |
701 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
702 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
703 |
-} |
704 |
- |
705 |
-pkg_postinst() { |
706 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
707 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
708 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
709 |
- |
710 |
- elog "To manage Tomcat instances, run:" |
711 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
712 |
- |
713 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
714 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
715 |
- |
716 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
717 |
-} |
718 |
|
719 |
diff --git a/www-servers/tomcat/tomcat-8.5.23.ebuild b/www-servers/tomcat/tomcat-8.5.23.ebuild |
720 |
deleted file mode 100644 |
721 |
index dce4c263018..00000000000 |
722 |
--- a/www-servers/tomcat/tomcat-8.5.23.ebuild |
723 |
+++ /dev/null |
724 |
@@ -1,157 +0,0 @@ |
725 |
-# Copyright 1999-2017 Gentoo Foundation |
726 |
-# Distributed under the terms of the GNU General Public License v2 |
727 |
- |
728 |
-EAPI=6 |
729 |
- |
730 |
-JAVA_PKG_IUSE="doc source test" |
731 |
- |
732 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
733 |
- |
734 |
-MY_P="apache-${P}-src" |
735 |
- |
736 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
737 |
-HOMEPAGE="https://tomcat.apache.org/" |
738 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
739 |
- |
740 |
-LICENSE="Apache-2.0" |
741 |
-SLOT="8.5" |
742 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
743 |
-IUSE="extra-webapps" |
744 |
- |
745 |
-RESTRICT="test" # can we run them on a production system? |
746 |
- |
747 |
-ECJ_SLOT="4.5" |
748 |
-SAPI_SLOT="3.1" |
749 |
- |
750 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
751 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
752 |
-RDEPEND="${COMMON_DEP} |
753 |
- !<dev-java/tomcat-native-1.1.24 |
754 |
- >=virtual/jre-1.7" |
755 |
-DEPEND="${COMMON_DEP} |
756 |
- app-admin/pwgen |
757 |
- >=virtual/jdk-1.7 |
758 |
- test? ( |
759 |
- >=dev-java/ant-junit-1.9:0 |
760 |
- dev-java/easymock:3.2 |
761 |
- )" |
762 |
- |
763 |
-S=${WORKDIR}/${MY_P} |
764 |
- |
765 |
-pkg_setup() { |
766 |
- java-pkg-2_pkg_setup |
767 |
- enewgroup tomcat 265 |
768 |
- enewuser tomcat 265 -1 /dev/null tomcat |
769 |
-} |
770 |
- |
771 |
-src_prepare() { |
772 |
- default |
773 |
- |
774 |
- find -name '*.jar' -type f -delete -print || die |
775 |
- |
776 |
- # Remove bundled servlet-api |
777 |
- rm -rv java/javax/{el,servlet} || die |
778 |
- |
779 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
780 |
- |
781 |
- # For use of catalina.sh in netbeans |
782 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
783 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
784 |
- bin/catalina.sh || die |
785 |
- |
786 |
- java-pkg-2_src_prepare |
787 |
-} |
788 |
- |
789 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
790 |
- |
791 |
-EANT_BUILD_TARGET="deploy" |
792 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
793 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
794 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
795 |
-EANT_NEEDS_TOOLS="true" |
796 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
797 |
- |
798 |
-# revisions of the scripts |
799 |
-IM_REV="-r2" |
800 |
-INIT_REV="-r1" |
801 |
- |
802 |
-src_compile() { |
803 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
804 |
- java-pkg-2_src_compile |
805 |
-} |
806 |
- |
807 |
-src_test() { |
808 |
- java-pkg-2_src_test |
809 |
-} |
810 |
- |
811 |
-src_install() { |
812 |
- local dest="/usr/share/${PN}-${SLOT}" |
813 |
- |
814 |
- java-pkg_jarinto "${dest}"/bin |
815 |
- java-pkg_dojar output/build/bin/*.jar |
816 |
- exeinto "${dest}"/bin |
817 |
- doexe output/build/bin/*.sh |
818 |
- |
819 |
- java-pkg_jarinto "${dest}"/lib |
820 |
- java-pkg_dojar output/build/lib/*.jar |
821 |
- |
822 |
- dodoc RELEASE-NOTES RUNNING.txt |
823 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
824 |
- use source && java-pkg_dosrc java/* |
825 |
- |
826 |
- ### Webapps ### |
827 |
- |
828 |
- # add missing docBase |
829 |
- local apps="host-manager manager" |
830 |
- for app in ${apps}; do |
831 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
832 |
- output/build/webapps/${app}/META-INF/context.xml || die |
833 |
- done |
834 |
- |
835 |
- insinto "${dest}"/webapps |
836 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
837 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
838 |
- |
839 |
- ### Config ### |
840 |
- |
841 |
- # create "logs" directory in $CATALINA_BASE |
842 |
- # and set correct perms, see #458890 |
843 |
- dodir "${dest}"/logs |
844 |
- fperms 0750 "${dest}"/logs |
845 |
- |
846 |
- # replace the default pw with a random one, see #92281 |
847 |
- local randpw="$(pwgen -s -B 15 1)" |
848 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
849 |
- |
850 |
- # prepend gentoo.classpath to common.loader, see #453212 |
851 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
852 |
- |
853 |
- insinto "${dest}" |
854 |
- doins -r output/build/conf |
855 |
- |
856 |
- ### rc ### |
857 |
- |
858 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
859 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
860 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
861 |
- |
862 |
- insinto "${dest}"/gentoo |
863 |
- doins "${T}"/tomcat.conf |
864 |
- exeinto "${dest}"/gentoo |
865 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
866 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
867 |
-} |
868 |
- |
869 |
-pkg_postinst() { |
870 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
871 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
872 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
873 |
- |
874 |
- elog "To manage Tomcat instances, run:" |
875 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
876 |
- |
877 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
878 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
879 |
- |
880 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
881 |
-} |