1 |
commit: c819430774cee0183fba70c187c3244d883c2b45 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 23:38:05 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 23:38:05 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8194307 |
7 |
|
8 |
www-servers/tomcat: dropping 9.0.7 + dropping to unstable |
9 |
|
10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 1 - |
14 |
.../tomcat/files/tomcat-9.0.4-build.xml.patch | 256 --------------------- |
15 |
www-servers/tomcat/tomcat-9.0.7.ebuild | 157 ------------- |
16 |
3 files changed, 414 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
19 |
index 07d17aa1390..bd849bc0f4b 100644 |
20 |
--- a/www-servers/tomcat/Manifest |
21 |
+++ b/www-servers/tomcat/Manifest |
22 |
@@ -2,6 +2,5 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421 |
23 |
DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 |
24 |
DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 |
25 |
DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 |
26 |
-DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 |
27 |
DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef |
28 |
DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30 |
29 |
|
30 |
diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch |
31 |
deleted file mode 100644 |
32 |
index feb5f126a37..00000000000 |
33 |
--- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch |
34 |
+++ /dev/null |
35 |
@@ -1,256 +0,0 @@ |
36 |
---- a/build.xml |
37 |
-+++ b/build.xml |
38 |
-@@ -719,24 +719,30 @@ |
39 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
40 |
- |
41 |
- <!-- Servlet 4.0 Implementation JAR File --> |
42 |
-+<!-- |
43 |
- <jarIt jarfile="${servlet-api.jar}" |
44 |
- filesDir="${tomcat.classes}" |
45 |
- filesId="files.servlet-api" |
46 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
47 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
48 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
49 |
-+--> |
50 |
- |
51 |
- <!-- JSP 2.3 Implementation JAR File --> |
52 |
-+<!-- |
53 |
- <jarIt jarfile="${jsp-api.jar}" |
54 |
- filesDir="${tomcat.classes}" |
55 |
- filesId="files.jsp-api" |
56 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
57 |
-+--> |
58 |
- |
59 |
- <!-- EL 3.0 Implementation JAR File --> |
60 |
-+<!-- |
61 |
- <jarIt jarfile="${el-api.jar}" |
62 |
- filesDir="${tomcat.classes}" |
63 |
- filesId="files.el-api" |
64 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
65 |
-+--> |
66 |
- |
67 |
- <!-- WebSocket 1.1 API JAR File --> |
68 |
- <jarIt jarfile="${websocket-api.jar}" |
69 |
-@@ -1012,9 +1018,9 @@ |
70 |
- |
71 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
72 |
- description="Default. Builds a working Tomcat instance"> |
73 |
-- |
74 |
-+<!-- |
75 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
76 |
-- |
77 |
-+--> |
78 |
- <!-- Copy scripts --> |
79 |
- <copy todir="${tomcat.build}/bin"> |
80 |
- <fileset dir="bin"> |
81 |
-@@ -1074,7 +1080,7 @@ |
82 |
- <exclude name="${jdt.jar.filename}"/> |
83 |
- </fileset> |
84 |
- </delete> |
85 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
86 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
87 |
- |
88 |
- <!-- Add sources for examples --> |
89 |
- <antcall target="examples-sources" /> |
90 |
-@@ -1108,7 +1114,7 @@ |
91 |
- </javac> |
92 |
- </target> |
93 |
- |
94 |
-- <target name="build-tomcat-jdbc" depends="package"> |
95 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
96 |
- <!-- build the jdbc-pool jar and source jar--> |
97 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
98 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
99 |
-@@ -1123,7 +1129,7 @@ |
100 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
101 |
- </target> |
102 |
- |
103 |
-- <target name="build-tomcat-jdbc-src"> |
104 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
105 |
- <!-- build the jdbc-pool source jar--> |
106 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
107 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
108 |
-@@ -1227,9 +1233,11 @@ |
109 |
- |
110 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
111 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
112 |
-+<!-- |
113 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
114 |
- failonerror="false"/> |
115 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
116 |
-+--> |
117 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
118 |
- |
119 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
120 |
-@@ -1612,7 +1620,7 @@ |
121 |
- |
122 |
- <target name="extras-webservices-prepare" |
123 |
- depends="extras-prepare" |
124 |
-- description="Prepare to build web services extras package"> |
125 |
-+ description="Prepare to build web services extras package" unless="noget"> |
126 |
- |
127 |
- <antcall target="downloadfile"> |
128 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
129 |
-@@ -1752,11 +1760,12 @@ |
130 |
- </copy> |
131 |
- |
132 |
- <!-- Source bundles for native components --> |
133 |
-+<!-- |
134 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
135 |
- file="${tomcat-native.tar.gz}" /> |
136 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
137 |
- file="${commons-daemon.native.src.tgz}" /> |
138 |
-- |
139 |
-+--> |
140 |
- <!-- platform README files --> |
141 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
142 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
143 |
-@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
144 |
- |
145 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
146 |
- description="Create the Tomcat javadoc" > |
147 |
-+<!-- |
148 |
- <javadoc packagenames="javax.servlet.*" |
149 |
- excludepackagenames="javax.servlet.jsp.*" |
150 |
- sourcepath="${tomcat.dist}/src/java" |
151 |
-@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
152 |
- <path location="${ant.core.lib}"/> |
153 |
- </classpath> |
154 |
- </javadoc> |
155 |
-+--> |
156 |
- <javadoc packagenames="javax.websocket.*" |
157 |
- sourcepath="${tomcat.dist}/src/java" |
158 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
159 |
-@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
160 |
- <path refid="tomcat.webservices.classpath"/> |
161 |
- <path location="${ant.core.lib}"/> |
162 |
- </classpath> |
163 |
-+<!-- |
164 |
- <link href="../servletapi"/> |
165 |
- <link href="../jspapi"/> |
166 |
- <link href="../elapi"/> |
167 |
-+--> |
168 |
- <link href="../websocketapi"/> |
169 |
- <link href="http://docs.oracle.com/javase/8/docs/api/"/> |
170 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
171 |
-@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" /> |
172 |
- </target> |
173 |
- |
174 |
- <target name="download-compile" |
175 |
-- description="Download (and build) components necessary to compile" > |
176 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
177 |
- |
178 |
- <!-- Download Commons Daemon --> |
179 |
- <antcall target="downloadgz-2"> |
180 |
-@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" /> |
181 |
- </target> |
182 |
- |
183 |
- <target name="download-test-compile" |
184 |
-- description="Download additional components for the tests" > |
185 |
-+ description="Download additional components for the tests" unless="noget"> |
186 |
- |
187 |
- <antcall target="downloadfile"> |
188 |
- <param name="sourcefile" value="${junit.loc}"/> |
189 |
-@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" /> |
190 |
- </target> |
191 |
- |
192 |
- <target name="download-dist" |
193 |
-- description="Download additional components for a distribution" > |
194 |
-+ description="Download additional components for a distribution" unless="noget"> |
195 |
- |
196 |
- <antcall target="downloadfile-2"> |
197 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
198 |
-@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" /> |
199 |
- |
200 |
- <!-- =============== Utility Targets to support downloads ================ --> |
201 |
- |
202 |
-- <target name="setproxy" if="${proxy.use}"> |
203 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
204 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
205 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
206 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
207 |
- </target> |
208 |
- |
209 |
-- <target name="testexist"> |
210 |
-+ <target name="testexist" unless="noget"> |
211 |
- <echo message="Testing for ${destfile}"/> |
212 |
- <available file="${destfile}" property="exist"/> |
213 |
- </target> |
214 |
- |
215 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
216 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
217 |
- <!-- Download and extract the package --> |
218 |
- <local name="temp.file"/> |
219 |
- <mkdir dir="${base.path}"/> |
220 |
-@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" /> |
221 |
- <delete file="${temp.file}.tar.gz"/> |
222 |
- </target> |
223 |
- |
224 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
225 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
226 |
- <!-- Download and extract the package from the two alternative locations --> |
227 |
- <local name="temp.file"/> |
228 |
- <mkdir dir="${base.path}"/> |
229 |
-@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" /> |
230 |
- <delete file="${temp.file}.tar.gz"/> |
231 |
- </target> |
232 |
- |
233 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
234 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
235 |
- <!-- Download and extract the package --> |
236 |
- <local name="temp.file"/> |
237 |
- <mkdir dir="${base.path}"/> |
238 |
-@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" /> |
239 |
- <delete file="${temp.file}"/> |
240 |
- </target> |
241 |
- |
242 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
243 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
244 |
- <!-- Download and extract the package from the two alternative locations --> |
245 |
- <local name="temp.file"/> |
246 |
- <mkdir dir="${base.path}"/> |
247 |
-@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" /> |
248 |
- <delete file="${temp.file}"/> |
249 |
- </target> |
250 |
- |
251 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
252 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
253 |
- <!-- Download the file --> |
254 |
- <local name="temp.file"/> |
255 |
- <mkdir dir="${base.path}"/> |
256 |
-@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" /> |
257 |
- <move file="${temp.file}" tofile="${destfile}"/> |
258 |
- </target> |
259 |
- |
260 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
261 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
262 |
- <!-- Download the file from the two alternative locations --> |
263 |
- <local name="temp.file"/> |
264 |
- <mkdir dir="${base.path}"/> |
265 |
-@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" /> |
266 |
- <move file="${temp.file}" tofile="${destfile}"/> |
267 |
- </target> |
268 |
- |
269 |
-- <target name="trydownload.check" depends="setproxy"> |
270 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
271 |
- <condition property="trydownload.run"> |
272 |
- <and> |
273 |
- <not> |
274 |
-@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" /> |
275 |
- </condition> |
276 |
- </target> |
277 |
- |
278 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
279 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
280 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
281 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
282 |
- </target> |
283 |
-@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" /> |
284 |
- |
285 |
- <target name="ide-eclipse" |
286 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
287 |
-- description="Prepares the source tree to be built in Eclipse"> |
288 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
289 |
- |
290 |
- <!-- Copy the sample project files into the root directory --> |
291 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
292 |
|
293 |
diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild |
294 |
deleted file mode 100644 |
295 |
index 967fffcd751..00000000000 |
296 |
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild |
297 |
+++ /dev/null |
298 |
@@ -1,157 +0,0 @@ |
299 |
-# Copyright 1999-2019 Gentoo Authors |
300 |
-# Distributed under the terms of the GNU General Public License v2 |
301 |
- |
302 |
-EAPI=6 |
303 |
- |
304 |
-JAVA_PKG_IUSE="doc source test" |
305 |
- |
306 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
307 |
- |
308 |
-MY_P="apache-${PN}-${PV}-src" |
309 |
- |
310 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" |
311 |
-HOMEPAGE="https://tomcat.apache.org/" |
312 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
313 |
- |
314 |
-LICENSE="Apache-2.0" |
315 |
-SLOT="9" |
316 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
317 |
-IUSE="extra-webapps" |
318 |
- |
319 |
-RESTRICT="test" # can we run them on a production system? |
320 |
- |
321 |
-ECJ_SLOT="4.5" |
322 |
-SAPI_SLOT="4.0" |
323 |
- |
324 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
325 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
326 |
-RDEPEND="${COMMON_DEP} |
327 |
- >=virtual/jre-1.8" |
328 |
-DEPEND="${COMMON_DEP} |
329 |
- app-admin/pwgen |
330 |
- >=virtual/jdk-1.8 |
331 |
- test? ( |
332 |
- >=dev-java/ant-junit-1.9:0 |
333 |
- dev-java/easymock:3.2 |
334 |
- )" |
335 |
- |
336 |
-S=${WORKDIR}/${MY_P} |
337 |
- |
338 |
-pkg_setup() { |
339 |
- java-pkg-2_pkg_setup |
340 |
- enewgroup tomcat 265 |
341 |
- enewuser tomcat 265 -1 /dev/null tomcat |
342 |
-} |
343 |
- |
344 |
-src_prepare() { |
345 |
- default |
346 |
- |
347 |
- find -name '*.jar' -type f -delete -print || die |
348 |
- |
349 |
- # Remove bundled servlet-api |
350 |
- rm -rv java/javax/{el,servlet} || die |
351 |
- |
352 |
- eapply "${FILESDIR}/${PN}-9.0.4-build.xml.patch" |
353 |
- |
354 |
- # For use of catalina.sh in netbeans |
355 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
356 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
357 |
- bin/catalina.sh || die |
358 |
- |
359 |
- java-pkg-2_src_prepare |
360 |
-} |
361 |
- |
362 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
363 |
- |
364 |
-EANT_BUILD_TARGET="deploy" |
365 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
366 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
367 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
368 |
-EANT_NEEDS_TOOLS="true" |
369 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
370 |
- |
371 |
-# revisions of the scripts |
372 |
-IM_REV="-r2" |
373 |
-INIT_REV="-r1" |
374 |
- |
375 |
-src_compile() { |
376 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
377 |
- java-pkg-2_src_compile |
378 |
-} |
379 |
- |
380 |
-src_test() { |
381 |
- java-pkg-2_src_test |
382 |
-} |
383 |
- |
384 |
-src_install() { |
385 |
- local dest="/usr/share/${PN}-${SLOT}" |
386 |
- |
387 |
- java-pkg_jarinto "${dest}"/bin |
388 |
- java-pkg_dojar output/build/bin/*.jar |
389 |
- exeinto "${dest}"/bin |
390 |
- doexe output/build/bin/*.sh |
391 |
- |
392 |
- java-pkg_jarinto "${dest}"/lib |
393 |
- java-pkg_dojar output/build/lib/*.jar |
394 |
- |
395 |
- dodoc RELEASE-NOTES RUNNING.txt |
396 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
397 |
- use source && java-pkg_dosrc java/* |
398 |
- |
399 |
- ### Webapps ### |
400 |
- |
401 |
- # add missing docBase |
402 |
- local apps="host-manager manager" |
403 |
- for app in ${apps}; do |
404 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
405 |
- output/build/webapps/${app}/META-INF/context.xml || die |
406 |
- done |
407 |
- |
408 |
- insinto "${dest}"/webapps |
409 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
410 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
411 |
- |
412 |
- ### Config ### |
413 |
- |
414 |
- # create "logs" directory in $CATALINA_BASE |
415 |
- # and set correct perms, see #458890 |
416 |
- dodir "${dest}"/logs |
417 |
- fperms 0750 "${dest}"/logs |
418 |
- |
419 |
- # replace the default pw with a random one, see #92281 |
420 |
- local randpw="$(pwgen -s -B 15 1)" |
421 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
422 |
- |
423 |
- # prepend gentoo.classpath to common.loader, see #453212 |
424 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
425 |
- |
426 |
- insinto "${dest}" |
427 |
- doins -r output/build/conf |
428 |
- |
429 |
- ### rc ### |
430 |
- |
431 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
432 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
433 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
434 |
- |
435 |
- insinto "${dest}"/gentoo |
436 |
- doins "${T}"/tomcat.conf |
437 |
- exeinto "${dest}"/gentoo |
438 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
439 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
440 |
-} |
441 |
- |
442 |
-pkg_postinst() { |
443 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
444 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
445 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
446 |
- |
447 |
- elog "To manage Tomcat instances, run:" |
448 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
449 |
- |
450 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
451 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
452 |
- |
453 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
454 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
455 |
-} |