1 |
commit: 57bfe350a1c97709f203316aa1dce387cc4d6f96 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 19 14:45:16 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 19 14:50:57 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57bfe350 |
7 |
|
8 |
www-servers/tomcat-{7.0.92,8.5.38}: removed obsolete |
9 |
|
10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 2 - |
14 |
.../tomcat/files/tomcat-8.5.37-build.xml.patch | 247 --------------------- |
15 |
www-servers/tomcat/tomcat-7.0.92.ebuild | 147 ------------ |
16 |
www-servers/tomcat/tomcat-8.5.38.ebuild | 159 ------------- |
17 |
4 files changed, 555 deletions(-) |
18 |
|
19 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
20 |
index 76d30bbf913..03598b47525 100644 |
21 |
--- a/www-servers/tomcat/Manifest |
22 |
+++ b/www-servers/tomcat/Manifest |
23 |
@@ -1,7 +1,5 @@ |
24 |
-DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a |
25 |
DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc |
26 |
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e |
27 |
-DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee |
28 |
DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d |
29 |
DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce |
30 |
DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602 |
31 |
|
32 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch |
33 |
deleted file mode 100644 |
34 |
index 4c2d8da9e91..00000000000 |
35 |
--- a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch |
36 |
+++ /dev/null |
37 |
@@ -1,247 +0,0 @@ |
38 |
-diff --git a/build.xml b/build.xml |
39 |
-index 6fbb321..4fb4b42 100644 |
40 |
---- a/build.xml |
41 |
-+++ b/build.xml |
42 |
-@@ -722,24 +722,29 @@ |
43 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
44 |
- |
45 |
- <!-- Servlet 3.1 Implementation JAR File --> |
46 |
-+<!-- |
47 |
- <jarIt jarfile="${servlet-api.jar}" |
48 |
- filesDir="${tomcat.classes}" |
49 |
- filesId="files.servlet-api" |
50 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
51 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
52 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
53 |
-- |
54 |
-+--> |
55 |
- <!-- JSP 2.3 Implementation JAR File --> |
56 |
-+<!-- |
57 |
- <jarIt jarfile="${jsp-api.jar}" |
58 |
- filesDir="${tomcat.classes}" |
59 |
- filesId="files.jsp-api" |
60 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
61 |
-+--> |
62 |
- |
63 |
- <!-- EL 3.0 Implementation JAR File --> |
64 |
-+<!-- |
65 |
- <jarIt jarfile="${el-api.jar}" |
66 |
- filesDir="${tomcat.classes}" |
67 |
- filesId="files.el-api" |
68 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
69 |
-+--> |
70 |
- |
71 |
- <!-- WebSocket 1.1 API JAR File --> |
72 |
- <jarIt jarfile="${websocket-api.jar}" |
73 |
-@@ -1025,9 +1030,9 @@ |
74 |
- |
75 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
76 |
- description="Default. Builds a working Tomcat instance"> |
77 |
-- |
78 |
-+<!-- |
79 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
80 |
-- |
81 |
-+--> |
82 |
- <!-- Copy scripts --> |
83 |
- <copy todir="${tomcat.build}/bin"> |
84 |
- <fileset dir="bin"> |
85 |
-@@ -1087,7 +1092,7 @@ |
86 |
- <exclude name="${jdt.jar.filename}"/> |
87 |
- </fileset> |
88 |
- </delete> |
89 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
90 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
91 |
- |
92 |
- <!-- Add sources for examples --> |
93 |
- <antcall target="examples-sources" /> |
94 |
-@@ -1123,7 +1128,7 @@ |
95 |
- </javac> |
96 |
- </target> |
97 |
- |
98 |
-- <target name="build-tomcat-jdbc" depends="package"> |
99 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
100 |
- <!-- build the jdbc-pool jar and source jar--> |
101 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
102 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
103 |
-@@ -1138,7 +1143,7 @@ |
104 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
105 |
- </target> |
106 |
- |
107 |
-- <target name="build-tomcat-jdbc-src"> |
108 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
109 |
- <!-- build the jdbc-pool source jar--> |
110 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
111 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
112 |
-@@ -1242,9 +1247,11 @@ |
113 |
- |
114 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
115 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
116 |
-+<!-- |
117 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
118 |
- failonerror="false"/> |
119 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
120 |
-+--> |
121 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
122 |
- |
123 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
124 |
-@@ -1624,7 +1631,7 @@ |
125 |
- |
126 |
- <target name="extras-webservices-prepare" |
127 |
- depends="extras-prepare" |
128 |
-- description="Prepare to build web services extras package"> |
129 |
-+ description="Prepare to build web services extras package" unless="noget"> |
130 |
- |
131 |
- <antcall target="downloadfile"> |
132 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
133 |
-@@ -1720,6 +1727,7 @@ |
134 |
- |
135 |
- <target name="javadoc" depends="dist-source" |
136 |
- description="Create the Tomcat javadoc" > |
137 |
-+<!-- |
138 |
- <javadoc packagenames="javax.servlet.*" |
139 |
- excludepackagenames="javax.servlet.jsp.*" |
140 |
- sourcepath="${tomcat.dist}/src/java" |
141 |
-@@ -1784,6 +1792,7 @@ |
142 |
- <path location="${ant.core.lib}"/> |
143 |
- </classpath> |
144 |
- </javadoc> |
145 |
-+--> |
146 |
- <javadoc packagenames="javax.websocket.*" |
147 |
- sourcepath="${tomcat.dist}/src/java" |
148 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
149 |
-@@ -1824,9 +1833,11 @@ |
150 |
- <path refid="tomcat.webservices.classpath"/> |
151 |
- <path location="${ant.core.lib}"/> |
152 |
- </classpath> |
153 |
-+<!-- |
154 |
- <link href="../servletapi"/> |
155 |
- <link href="../jspapi"/> |
156 |
- <link href="../elapi"/> |
157 |
-+--> |
158 |
- <link href="../websocketapi"/> |
159 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
160 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
161 |
-@@ -2550,7 +2561,7 @@ skip.installer property in build.properties" /> |
162 |
- </target> |
163 |
- |
164 |
- <target name="download-compile" |
165 |
-- description="Download (and build) components necessary to compile" > |
166 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
167 |
- |
168 |
- <!-- Download Commons Daemon --> |
169 |
- <antcall target="downloadgz-2"> |
170 |
-@@ -2576,7 +2587,7 @@ skip.installer property in build.properties" /> |
171 |
- </target> |
172 |
- |
173 |
- <target name="download-test-compile" |
174 |
-- description="Download additional components for the tests" > |
175 |
-+ description="Download additional components for the tests" unless="noget"> |
176 |
- |
177 |
- <antcall target="downloadfile"> |
178 |
- <param name="sourcefile" value="${junit.loc}"/> |
179 |
-@@ -2654,7 +2665,7 @@ skip.installer property in build.properties" /> |
180 |
- </target> |
181 |
- |
182 |
- <target name="download-dist" |
183 |
-- description="Download additional components for a distribution" > |
184 |
-+ description="Download additional components for a distribution" unless="noget"> |
185 |
- |
186 |
- <antcall target="downloadfile-2"> |
187 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
188 |
-@@ -2709,13 +2720,13 @@ skip.installer property in build.properties" /> |
189 |
- |
190 |
- <!-- =============== Utility Targets to support downloads ================ --> |
191 |
- |
192 |
-- <target name="setproxy" if="${proxy.use}"> |
193 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
194 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
195 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
196 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
197 |
- </target> |
198 |
- |
199 |
-- <target name="testexist"> |
200 |
-+ <target name="testexist" unless="noget"> |
201 |
- <echo message="Testing for ${destfile}"/> |
202 |
- <available file="${destfile}" property="exist"/> |
203 |
- </target> |
204 |
-@@ -2837,7 +2848,7 @@ skip.installer property in build.properties" /> |
205 |
- </sequential> |
206 |
- </macrodef> |
207 |
- |
208 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
209 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
210 |
- <!-- Download and extract the package --> |
211 |
- <local name="temp.file"/> |
212 |
- <mkdir dir="${base.path}"/> |
213 |
-@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" /> |
214 |
- <delete file="${temp.file}.tar.gz"/> |
215 |
- </target> |
216 |
- |
217 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
218 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
219 |
- <!-- Download and extract the package from the two alternative locations --> |
220 |
- <local name="temp.file"/> |
221 |
- <mkdir dir="${base.path}"/> |
222 |
-@@ -2879,7 +2890,7 @@ skip.installer property in build.properties" /> |
223 |
- <delete file="${temp.file}.tar.gz"/> |
224 |
- </target> |
225 |
- |
226 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
227 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
228 |
- <!-- Download and extract the package --> |
229 |
- <local name="temp.file"/> |
230 |
- <mkdir dir="${base.path}"/> |
231 |
-@@ -2895,7 +2906,7 @@ skip.installer property in build.properties" /> |
232 |
- <delete file="${temp.file}"/> |
233 |
- </target> |
234 |
- |
235 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
236 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
237 |
- <!-- Download and extract the package from the two alternative locations --> |
238 |
- <local name="temp.file"/> |
239 |
- <mkdir dir="${base.path}"/> |
240 |
-@@ -2919,7 +2930,7 @@ skip.installer property in build.properties" /> |
241 |
- <delete file="${temp.file}"/> |
242 |
- </target> |
243 |
- |
244 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
245 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
246 |
- <!-- Download the file --> |
247 |
- <local name="temp.file"/> |
248 |
- <mkdir dir="${base.path}"/> |
249 |
-@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" /> |
250 |
- <move file="${temp.file}" tofile="${destfile}"/> |
251 |
- </target> |
252 |
- |
253 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
254 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
255 |
- <!-- Download the file from the two alternative locations --> |
256 |
- <local name="temp.file"/> |
257 |
- <mkdir dir="${base.path}"/> |
258 |
-@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" /> |
259 |
- <move file="${temp.file}" tofile="${destfile}"/> |
260 |
- </target> |
261 |
- |
262 |
-- <target name="trydownload.check" depends="setproxy"> |
263 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
264 |
- <condition property="trydownload.run"> |
265 |
- <and> |
266 |
- <not> |
267 |
-@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" /> |
268 |
- </condition> |
269 |
- </target> |
270 |
- |
271 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
272 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
273 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
274 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
275 |
- </target> |
276 |
-@@ -2984,7 +2995,7 @@ skip.installer property in build.properties" /> |
277 |
- |
278 |
- <target name="ide-eclipse" |
279 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
280 |
-- description="Prepares the source tree to be built in Eclipse"> |
281 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
282 |
- |
283 |
- <!-- Copy the sample project files into the root directory --> |
284 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
285 |
|
286 |
diff --git a/www-servers/tomcat/tomcat-7.0.92.ebuild b/www-servers/tomcat/tomcat-7.0.92.ebuild |
287 |
deleted file mode 100644 |
288 |
index 9acd6b92a2e..00000000000 |
289 |
--- a/www-servers/tomcat/tomcat-7.0.92.ebuild |
290 |
+++ /dev/null |
291 |
@@ -1,147 +0,0 @@ |
292 |
-# Copyright 1999-2019 Gentoo Authors |
293 |
-# Distributed under the terms of the GNU General Public License v2 |
294 |
- |
295 |
-EAPI=6 |
296 |
- |
297 |
-JAVA_PKG_IUSE="doc source test" |
298 |
- |
299 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
300 |
- |
301 |
-MY_P="apache-${P}-src" |
302 |
- |
303 |
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
304 |
-HOMEPAGE="https://tomcat.apache.org/" |
305 |
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
306 |
- |
307 |
-LICENSE="Apache-2.0" |
308 |
-SLOT="7" |
309 |
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
310 |
-IUSE="extra-webapps websockets" |
311 |
- |
312 |
-RESTRICT="test" # can we run them on a production system? |
313 |
- |
314 |
-ECJ_SLOT="4.5" |
315 |
-SAPI_SLOT="3.0" |
316 |
- |
317 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
318 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
319 |
-RDEPEND="${COMMON_DEP} |
320 |
- virtual/jre |
321 |
- !<dev-java/tomcat-native-1.1.24" |
322 |
-DEPEND="${COMMON_DEP} |
323 |
- virtual/jdk:1.8 |
324 |
- test? ( dev-java/ant-junit:0 )" |
325 |
- |
326 |
-S=${WORKDIR}/${MY_P} |
327 |
- |
328 |
-pkg_setup() { |
329 |
- java-pkg-2_pkg_setup |
330 |
- enewgroup tomcat 265 |
331 |
- enewuser tomcat 265 -1 /dev/null tomcat |
332 |
-} |
333 |
- |
334 |
-src_prepare() { |
335 |
- default |
336 |
- |
337 |
- # Remove bundled servlet-api |
338 |
- rm -rv java/javax/{el,servlet} || die |
339 |
- |
340 |
- java-pkg_clean |
341 |
- |
342 |
- eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch" |
343 |
- |
344 |
- # For use of catalina.sh in netbeans |
345 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
346 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
347 |
- bin/catalina.sh || die |
348 |
- |
349 |
- java-pkg-2_src_prepare |
350 |
-} |
351 |
- |
352 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
353 |
- |
354 |
-EANT_BUILD_TARGET="deploy" |
355 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
356 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
357 |
-EANT_NEEDS_TOOLS="true" |
358 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
359 |
- |
360 |
-# revisions of the scripts |
361 |
-IM_REV="-r1" |
362 |
-INIT_REV="-r1" |
363 |
- |
364 |
-src_compile() { |
365 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
366 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
367 |
- java-pkg-2_src_compile |
368 |
-} |
369 |
- |
370 |
-src_test() { |
371 |
- java-pkg-2_src_test |
372 |
-} |
373 |
- |
374 |
-src_install() { |
375 |
- local dest="/usr/share/${PN}-${SLOT}" |
376 |
- |
377 |
- java-pkg_jarinto "${dest}"/bin |
378 |
- java-pkg_dojar output/build/bin/*.jar |
379 |
- exeinto "${dest}"/bin |
380 |
- doexe output/build/bin/*.sh |
381 |
- |
382 |
- java-pkg_jarinto "${dest}"/lib |
383 |
- java-pkg_dojar output/build/lib/*.jar |
384 |
- |
385 |
- dodoc RELEASE-NOTES RUNNING.txt |
386 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
387 |
- use source && java-pkg_dosrc java/* |
388 |
- |
389 |
- ### Webapps ### |
390 |
- |
391 |
- insinto "${dest}"/webapps |
392 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
393 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
394 |
- |
395 |
- ### Config ### |
396 |
- |
397 |
- # create "logs" directory in $CATALINA_BASE |
398 |
- # and set correct perms, see #458890 |
399 |
- dodir "${dest}"/logs |
400 |
- fperms 0750 "${dest}"/logs |
401 |
- |
402 |
- # replace the default pw with a random one, see #92281 |
403 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
404 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
405 |
- |
406 |
- # prepend gentoo.classpath to common.loader, see #453212 |
407 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
408 |
- |
409 |
- insinto "${dest}" |
410 |
- doins -r output/build/conf |
411 |
- |
412 |
- ### rc ### |
413 |
- |
414 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
415 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
416 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
417 |
- |
418 |
- insinto "${dest}"/gentoo |
419 |
- doins "${T}"/tomcat.conf |
420 |
- exeinto "${dest}"/gentoo |
421 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
422 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
423 |
-} |
424 |
- |
425 |
-pkg_postinst() { |
426 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
427 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
428 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
429 |
- |
430 |
- elog "To manage Tomcat instances, run:" |
431 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
432 |
- |
433 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
434 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
435 |
- |
436 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
437 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
438 |
-} |
439 |
|
440 |
diff --git a/www-servers/tomcat/tomcat-8.5.38.ebuild b/www-servers/tomcat/tomcat-8.5.38.ebuild |
441 |
deleted file mode 100644 |
442 |
index f4aff4478a6..00000000000 |
443 |
--- a/www-servers/tomcat/tomcat-8.5.38.ebuild |
444 |
+++ /dev/null |
445 |
@@ -1,159 +0,0 @@ |
446 |
-# Copyright 1999-2019 Gentoo Authors |
447 |
-# Distributed under the terms of the GNU General Public License v2 |
448 |
- |
449 |
-EAPI=6 |
450 |
- |
451 |
-JAVA_PKG_IUSE="doc source test" |
452 |
- |
453 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
454 |
- |
455 |
-MY_P="apache-${P}-src" |
456 |
- |
457 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
458 |
-HOMEPAGE="https://tomcat.apache.org/" |
459 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
460 |
- |
461 |
-LICENSE="Apache-2.0" |
462 |
-SLOT="8.5" |
463 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
464 |
-IUSE="extra-webapps" |
465 |
- |
466 |
-RESTRICT="test" # can we run them on a production system? |
467 |
- |
468 |
-ECJ_SLOT="4.5" |
469 |
-SAPI_SLOT="3.1" |
470 |
- |
471 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
472 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
473 |
-RDEPEND="${COMMON_DEP} |
474 |
- !<dev-java/tomcat-native-1.1.24 |
475 |
- >=virtual/jre-1.7" |
476 |
-DEPEND="${COMMON_DEP} |
477 |
- app-admin/pwgen |
478 |
- >=dev-java/ant-core-1.9.13 |
479 |
- >=virtual/jdk-1.7 |
480 |
- test? ( |
481 |
- >=dev-java/ant-junit-1.9:0 |
482 |
- dev-java/easymock:3.2 |
483 |
- )" |
484 |
- |
485 |
-S=${WORKDIR}/${MY_P} |
486 |
- |
487 |
-pkg_setup() { |
488 |
- java-pkg-2_pkg_setup |
489 |
- enewgroup tomcat 265 |
490 |
- enewuser tomcat 265 -1 /dev/null tomcat |
491 |
-} |
492 |
- |
493 |
-src_prepare() { |
494 |
- default |
495 |
- |
496 |
- find -name '*.jar' -type f -delete -print || die |
497 |
- |
498 |
- # Remove bundled servlet-api |
499 |
- rm -rv java/javax/{el,servlet} || die |
500 |
- |
501 |
- eapply "${FILESDIR}/${PN}-8.5.37-build.xml.patch" |
502 |
- |
503 |
- # For use of catalina.sh in netbeans |
504 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
505 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
506 |
- bin/catalina.sh || die |
507 |
- |
508 |
- java-pkg-2_src_prepare |
509 |
-} |
510 |
- |
511 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
512 |
- |
513 |
-EANT_BUILD_TARGET="deploy" |
514 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
515 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
516 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
517 |
-EANT_NEEDS_TOOLS="true" |
518 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
519 |
- |
520 |
-# revisions of the scripts |
521 |
-IM_REV="-r2" |
522 |
-INIT_REV="-r1" |
523 |
- |
524 |
-src_compile() { |
525 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
526 |
- java-pkg-2_src_compile |
527 |
-} |
528 |
- |
529 |
-src_test() { |
530 |
- java-pkg-2_src_test |
531 |
-} |
532 |
- |
533 |
-src_install() { |
534 |
- local dest="/usr/share/${PN}-${SLOT}" |
535 |
- |
536 |
- java-pkg_jarinto "${dest}"/bin |
537 |
- java-pkg_dojar output/build/bin/*.jar |
538 |
- exeinto "${dest}"/bin |
539 |
- doexe output/build/bin/*.sh |
540 |
- |
541 |
- java-pkg_jarinto "${dest}"/lib |
542 |
- java-pkg_dojar output/build/lib/*.jar |
543 |
- |
544 |
- dodoc RELEASE-NOTES RUNNING.txt |
545 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
546 |
- use source && java-pkg_dosrc java/* |
547 |
- |
548 |
- ### Webapps ### |
549 |
- |
550 |
- # add missing docBase |
551 |
- local apps="host-manager manager" |
552 |
- for app in ${apps}; do |
553 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
554 |
- output/build/webapps/${app}/META-INF/context.xml || die |
555 |
- done |
556 |
- |
557 |
- insinto "${dest}"/webapps |
558 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
559 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
560 |
- |
561 |
- ### Config ### |
562 |
- |
563 |
- # create "logs" directory in $CATALINA_BASE |
564 |
- # and set correct perms, see #458890 |
565 |
- dodir "${dest}"/logs |
566 |
- fperms 0750 "${dest}"/logs |
567 |
- |
568 |
- # replace the default pw with a random one, see #92281 |
569 |
- local randpw="$(pwgen -s -B 15 1)" |
570 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
571 |
- |
572 |
- # prepend gentoo.classpath to common.loader, see #453212 |
573 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
574 |
- |
575 |
- insinto "${dest}" |
576 |
- doins -r output/build/conf |
577 |
- |
578 |
- ### rc ### |
579 |
- |
580 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
581 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
582 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
583 |
- |
584 |
- insinto "${dest}"/gentoo |
585 |
- doins "${T}"/tomcat.conf |
586 |
- exeinto "${dest}"/gentoo |
587 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
588 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
589 |
-} |
590 |
- |
591 |
-pkg_postinst() { |
592 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
593 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
594 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
595 |
- |
596 |
- elog "To manage Tomcat instances, run:" |
597 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
598 |
- |
599 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
600 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
601 |
- |
602 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
603 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
604 |
-} |