Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/
Date: Sat, 20 Apr 2019 23:23:46
Message-Id: 1555685458.0ffb639856248f401e5a0425c6279445ccd4982f.fordfrog@gentoo
1 commit: 0ffb639856248f401e5a0425c6279445ccd4982f
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 19 14:47:34 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 19 14:50:58 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ffb6398
7
8 www-servers/tomcat-9.0.16: 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 | 1 -
14 .../tomcat/files/tomcat-9.0.16-build.xml.patch | 265 ---------------------
15 www-servers/tomcat/tomcat-9.0.16.ebuild | 182 --------------
16 3 files changed, 448 deletions(-)
17
18 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
19 index 03598b47525..dac737d170a 100644
20 --- a/www-servers/tomcat/Manifest
21 +++ b/www-servers/tomcat/Manifest
22 @@ -1,7 +1,6 @@
23 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
24 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
25 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
26 -DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
27 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
28 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
29 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
30
31 diff --git a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
32 deleted file mode 100644
33 index 8712be138e0..00000000000
34 --- a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
35 +++ /dev/null
36 @@ -1,265 +0,0 @@
37 -diff --git a/build.xml b/build.xml
38 -index e5c5076..72231a6 100644
39 ---- a/build.xml
40 -+++ b/build.xml
41 -@@ -742,6 +742,7 @@
42 - addOSGi="true" />
43 -
44 - <!-- Servlet 4.0 Implementation JAR File -->
45 -+<!--
46 - <jarIt jarfile="${servlet-api.jar}"
47 - filesDir="${tomcat.classes}"
48 - filesId="files.servlet-api"
49 -@@ -749,21 +750,23 @@
50 - notice="${tomcat.manifests}/servlet-api.jar.notice"
51 - license="${tomcat.manifests}/servlet-api.jar.license"
52 - addOSGi="true" />
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 - addOSGi="true" />
62 --
63 -+-->
64 - <!-- EL 3.0 Implementation JAR File -->
65 -+<!--
66 - <jarIt jarfile="${el-api.jar}"
67 - filesDir="${tomcat.classes}"
68 - filesId="files.el-api"
69 - manifest="${tomcat.manifests}/el-api.jar.manifest"
70 - addOSGi="true" />
71 --
72 -+-->
73 - <!-- WebSocket 1.1 API JAR File -->
74 - <jarIt jarfile="${websocket-api.jar}"
75 - filesDir="${tomcat.classes}"
76 -@@ -1114,9 +1117,9 @@
77 -
78 - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
79 - description="Default. Builds a working Tomcat instance">
80 --
81 -+<!--
82 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
83 --
84 -+-->
85 - <!-- Copy scripts -->
86 - <copy todir="${tomcat.build}/bin">
87 - <fileset dir="bin">
88 -@@ -1176,7 +1179,7 @@
89 - <exclude name="${jdt.jar.filename}"/>
90 - </fileset>
91 - </delete>
92 -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
93 -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
94 -
95 - <!-- Add sources for examples -->
96 - <antcall target="examples-sources" />
97 -@@ -1212,7 +1215,7 @@
98 - </javac>
99 - </target>
100 -
101 -- <target name="build-tomcat-jdbc" depends="package">
102 -+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
103 - <!-- build the jdbc-pool jar and source jar-->
104 - <echo message="Building Tomcat JDBC pool libraries"/>
105 - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
106 -@@ -1227,7 +1230,7 @@
107 - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
108 - </target>
109 -
110 -- <target name="build-tomcat-jdbc-src">
111 -+ <target name="build-tomcat-jdbc-src" unless="noget">
112 - <!-- build the jdbc-pool source jar-->
113 - <echo message="Building Tomcat JDBC pool src JAR"/>
114 - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
115 -@@ -1330,9 +1333,11 @@
116 -
117 - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
118 - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
119 -+<!--
120 - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
121 - failonerror="false"/>
122 - <copy file="${jdt.jar}" todir="${tomcat.embed}" />
123 -+-->
124 - <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
125 -
126 - <!-- Note the meta-inf below will work as long as there is only one JAR
127 -@@ -1785,11 +1790,12 @@
128 - </copy>
129 -
130 - <!-- Source bundles for native components -->
131 -+<!--
132 - <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
133 - file="${tomcat-native.tar.gz}" />
134 - <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
135 - file="${commons-daemon.native.src.tgz}" />
136 --
137 -+-->
138 - <!-- platform README files -->
139 - <echo append="false" file="${tomcat.dist}/bin/x64/README">
140 - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
141 -@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
142 -
143 - <target name="javadoc" depends="dist-source"
144 - description="Create the Tomcat javadoc" >
145 -+<!--
146 - <javadoc packagenames="javax.servlet.*"
147 - excludepackagenames="javax.servlet.jsp.*"
148 - sourcepath="${tomcat.dist}/src/java"
149 -@@ -1860,6 +1867,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
150 - <path location="${ant.core.lib}"/>
151 - </classpath>
152 - </javadoc>
153 -+-->
154 - <javadoc packagenames="javax.websocket.*"
155 - sourcepath="${tomcat.dist}/src/java"
156 - destdir="${tomcat.dist}/webapps/docs/websocketapi"
157 -@@ -1898,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
158 - <path refid="compile.classpath"/>
159 - <path location="${ant.core.lib}"/>
160 - </classpath>
161 -+<!--
162 - <link href="../servletapi"/>
163 - <link href="../jspapi"/>
164 - <link href="../elapi"/>
165 -+-->
166 - <link href="../websocketapi"/>
167 - <link href="http://docs.oracle.com/javase/8/docs/api/"/>
168 - <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
169 -@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" />
170 - </target>
171 -
172 - <target name="download-compile"
173 -- description="Download (and build) components necessary to compile" >
174 -+ description="Download (and build) components necessary to compile" unless="noget">
175 -
176 - <!-- Download Commons Daemon -->
177 - <antcall target="downloadgz-2">
178 -@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" />
179 - </target>
180 -
181 - <target name="download-test-compile"
182 -- description="Download additional components for the tests" >
183 -+ description="Download additional components for the tests" unless="noget">
184 -
185 - <antcall target="downloadfile">
186 - <param name="sourcefile" value="${junit.loc}"/>
187 -@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" />
188 - </target>
189 -
190 - <target name="download-dist"
191 -- description="Download additional components for a distribution" >
192 -+ description="Download additional components for a distribution" unless="noget">
193 -
194 - <antcall target="downloadfile-2">
195 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
196 -@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" />
197 -
198 - <!-- =============== Utility Targets to support downloads ================ -->
199 -
200 -- <target name="setproxy" if="${proxy.use}">
201 -+ <target name="setproxy" if="${proxy.use}" unless="noget">
202 - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
203 - proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
204 - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
205 - </target>
206 -
207 -- <target name="testexist">
208 -+ <target name="testexist" unless="noget">
209 - <echo message="Testing for ${destfile}"/>
210 - <available file="${destfile}" property="exist"/>
211 - </target>
212 -@@ -2932,7 +2942,7 @@ skip.installer property in build.properties" />
213 - </sequential>
214 - </macrodef>
215 -
216 -- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
217 -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
218 - <!-- Download and extract the package -->
219 - <local name="temp.file"/>
220 - <mkdir dir="${base.path}"/>
221 -@@ -2949,7 +2959,7 @@ skip.installer property in build.properties" />
222 - <delete file="${temp.file}.tar.gz"/>
223 - </target>
224 -
225 -- <target name="downloadgz-2" unless="exist" depends="testexist">
226 -+ <target name="downloadgz-2" unless="noget" depends="testexist">
227 - <!-- Download and extract the package from the two alternative locations -->
228 - <local name="temp.file"/>
229 - <mkdir dir="${base.path}"/>
230 -@@ -2974,7 +2984,7 @@ skip.installer property in build.properties" />
231 - <delete file="${temp.file}.tar.gz"/>
232 - </target>
233 -
234 -- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
235 -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
236 - <!-- Download and extract the package -->
237 - <local name="temp.file"/>
238 - <mkdir dir="${base.path}"/>
239 -@@ -2990,7 +3000,7 @@ skip.installer property in build.properties" />
240 - <delete file="${temp.file}"/>
241 - </target>
242 -
243 -- <target name="downloadzip-2" unless="exist" depends="testexist">
244 -+ <target name="downloadzip-2" unless="noget" depends="testexist">
245 - <!-- Download and extract the package from the two alternative locations -->
246 - <local name="temp.file"/>
247 - <mkdir dir="${base.path}"/>
248 -@@ -3014,7 +3024,7 @@ skip.installer property in build.properties" />
249 - <delete file="${temp.file}"/>
250 - </target>
251 -
252 -- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
253 -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
254 - <!-- Download the file -->
255 - <local name="temp.file"/>
256 - <mkdir dir="${base.path}"/>
257 -@@ -3029,7 +3039,7 @@ skip.installer property in build.properties" />
258 - <move file="${temp.file}" tofile="${destfile}"/>
259 - </target>
260 -
261 -- <target name="downloadfile-2" unless="exist" depends="testexist">
262 -+ <target name="downloadfile-2" unless="noget" depends="testexist">
263 - <!-- Download the file from the two alternative locations -->
264 - <local name="temp.file"/>
265 - <mkdir dir="${base.path}"/>
266 -@@ -3057,7 +3067,7 @@ skip.installer property in build.properties" />
267 - <move file="${temp.file}" tofile="${destfile}"/>
268 - </target>
269 -
270 -- <target name="trydownload.check" depends="setproxy">
271 -+ <target name="trydownload.check" depends="setproxy" unless="noget">
272 - <condition property="trydownload.run">
273 - <and>
274 - <not>
275 -@@ -3068,7 +3078,7 @@ skip.installer property in build.properties" />
276 - </condition>
277 - </target>
278 -
279 -- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
280 -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
281 - <!-- Downloads a file if not yet downloaded and the source URL is available -->
282 - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
283 - </target>
284 -@@ -3079,7 +3089,7 @@ skip.installer property in build.properties" />
285 -
286 - <target name="ide-eclipse"
287 - depends="download-compile, download-test-compile"
288 -- description="Prepares the source tree to be built in Eclipse">
289 -+ description="Prepares the source tree to be built in Eclipse" unless="noget">
290 -
291 - <!-- Copy the sample project files into the root directory -->
292 - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
293 -@@ -3097,7 +3107,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
294 -
295 - <target name="ide-intellij"
296 - depends="download-compile, download-test-compile"
297 -- description="Creates project directory .idea for IntelliJ IDEA">
298 -+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
299 -
300 - <copy todir="${tomcat.home}/.idea">
301 - <fileset dir="${tomcat.home}/res/ide-support/idea"/>
302
303 diff --git a/www-servers/tomcat/tomcat-9.0.16.ebuild b/www-servers/tomcat/tomcat-9.0.16.ebuild
304 deleted file mode 100644
305 index e6cda13656f..00000000000
306 --- a/www-servers/tomcat/tomcat-9.0.16.ebuild
307 +++ /dev/null
308 @@ -1,182 +0,0 @@
309 -# Copyright 1999-2019 Gentoo Authors
310 -# Distributed under the terms of the GNU General Public License v2
311 -
312 -EAPI=6
313 -
314 -JAVA_PKG_IUSE="doc source test"
315 -
316 -inherit eutils java-pkg-2 java-ant-2 prefix user
317 -
318 -MY_P="apache-${PN}-${PV}-src"
319 -
320 -# Currently we bundle binary versions of bnd.jar and bndlib.jar
321 -# See bugs #203080 and #676116
322 -BND_VERSION="4.1.0"
323 -BND="biz.aQute.bnd-${BND_VERSION}.jar"
324 -BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
325 -
326 -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
327 -HOMEPAGE="https://tomcat.apache.org/"
328 -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
329 - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
330 - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
331 -
332 -LICENSE="Apache-2.0"
333 -SLOT="9"
334 -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
335 -IUSE="extra-webapps"
336 -
337 -RESTRICT="test" # can we run them on a production system?
338 -
339 -ECJ_SLOT="4.10"
340 -SAPI_SLOT="4.0"
341 -
342 -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
343 - dev-java/glassfish-xmlrpc-api:0
344 - dev-java/tomcat-servlet-api:${SAPI_SLOT}
345 - dev-java/wsdl4j:0"
346 -RDEPEND="${COMMON_DEP}
347 - !<dev-java/tomcat-native-1.1.24
348 - >=virtual/jre-11"
349 -DEPEND="${COMMON_DEP}
350 - app-admin/pwgen
351 - >=dev-java/ant-core-1.9.13
352 - >=virtual/jdk-11
353 - test? (
354 - >=dev-java/ant-junit-1.9:0
355 - dev-java/easymock:3.2
356 - )"
357 -
358 -S=${WORKDIR}/${MY_P}
359 -
360 -BND_HOME="${S}/tomcat-build-libs/bnd"
361 -BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
362 -BND_JAR="${BND_HOME}/${BND}"
363 -BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
364 -
365 -src_unpack() {
366 - unpack ${MY_P}.tar.gz
367 -
368 - mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
369 - ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
370 - ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
371 -}
372 -
373 -pkg_setup() {
374 - java-pkg-2_pkg_setup
375 - enewgroup tomcat 265
376 - enewuser tomcat 265 -1 /dev/null tomcat
377 -}
378 -
379 -src_prepare() {
380 - default
381 -
382 - find -name '*.jar' -type f -delete -print || die
383 -
384 - # Remove bundled servlet-api
385 - rm -rv java/javax/{el,servlet} || die
386 -
387 - eapply "${FILESDIR}/${P}-build.xml.patch"
388 -
389 - # For use of catalina.sh in netbeans
390 - sed -i -e "/^# ----- Execute The Requested Command/ a\
391 - CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
392 - bin/catalina.sh || die
393 -
394 - java-pkg-2_src_prepare
395 -}
396 -
397 -JAVA_ANT_REWRITE_CLASSPATH="true"
398 -
399 -EANT_BUILD_TARGET="deploy"
400 -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
401 -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
402 -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
403 -EANT_NEEDS_TOOLS="true"
404 -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
405 -
406 -# revisions of the scripts
407 -IM_REV="-r2"
408 -INIT_REV="-r1"
409 -
410 -src_compile() {
411 - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
412 - java-pkg-2_src_compile
413 -}
414 -
415 -src_test() {
416 - java-pkg-2_src_test
417 -}
418 -
419 -src_install() {
420 - local dest="/usr/share/${PN}-${SLOT}"
421 -
422 - java-pkg_jarinto "${dest}"/bin
423 - java-pkg_dojar output/build/bin/*.jar
424 - exeinto "${dest}"/bin
425 - doexe output/build/bin/*.sh
426 -
427 - java-pkg_jarinto "${dest}"/lib
428 - java-pkg_dojar output/build/lib/*.jar
429 -
430 - dodoc RELEASE-NOTES RUNNING.txt
431 - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
432 - use source && java-pkg_dosrc java/*
433 -
434 - ### Webapps ###
435 -
436 - # add missing docBase
437 - local apps="host-manager manager"
438 - for app in ${apps}; do
439 - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
440 - output/build/webapps/${app}/META-INF/context.xml || die
441 - done
442 -
443 - insinto "${dest}"/webapps
444 - doins -r output/build/webapps/{host-manager,manager,ROOT}
445 - use extra-webapps && doins -r output/build/webapps/{docs,examples}
446 -
447 - ### Config ###
448 -
449 - # create "logs" directory in $CATALINA_BASE
450 - # and set correct perms, see #458890
451 - dodir "${dest}"/logs
452 - fperms 0750 "${dest}"/logs
453 -
454 - # replace the default pw with a random one, see #92281
455 - local randpw="$(pwgen -s -B 15 1)"
456 - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
457 -
458 - # prepend gentoo.classpath to common.loader, see #453212
459 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
460 -
461 - insinto "${dest}"
462 - doins -r output/build/conf
463 -
464 - ### rc ###
465 -
466 - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
467 - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
468 - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
469 -
470 - insinto "${dest}"/gentoo
471 - doins "${T}"/tomcat.conf
472 - exeinto "${dest}"/gentoo
473 - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
474 - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
475 -}
476 -
477 -pkg_postinst() {
478 - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
479 - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
480 - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
481 -
482 - elog "To manage Tomcat instances, run:"
483 - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
484 -
485 - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
486 - ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
487 -
488 - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
489 - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
490 -}