1 |
commit: 110e461978da1eb8166116fd02ff6b95047dffd0 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 10 06:41:47 2017 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 10 06:41:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110e4619 |
7 |
|
8 |
www-servers/tomcat: removed old version in 8.5 slot |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
www-servers/tomcat/Manifest | 1 - |
13 |
.../tomcat/files/tomcat-8.5.16-build.xml.patch | 250 --------------------- |
14 |
www-servers/tomcat/tomcat-8.5.16.ebuild | 157 ------------- |
15 |
3 files changed, 408 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index 0c3d6bb41e8..0f5333ff3d2 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -2,6 +2,5 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff |
22 |
DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487 |
23 |
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0 |
24 |
DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9 |
25 |
-DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253 |
26 |
DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895 |
27 |
DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07 |
28 |
|
29 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch |
30 |
deleted file mode 100644 |
31 |
index 611c99d7a0e..00000000000 |
32 |
--- a/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch |
33 |
+++ /dev/null |
34 |
@@ -1,250 +0,0 @@ |
35 |
-diff --git a/apache-tomcat-8.5.4-src/build.xml b/apache-tomcat-8.5.4-src/build.xml |
36 |
-index 655e379..b973b7f 100644 |
37 |
---- a/apache-tomcat-8.5.4-src/build.xml |
38 |
-+++ b/apache-tomcat-8.5.4-src/build.xml |
39 |
-@@ -691,24 +691,29 @@ |
40 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
41 |
- |
42 |
- <!-- Servlet 3.1 Implementation JAR File --> |
43 |
-+<!-- |
44 |
- <jarIt jarfile="${servlet-api.jar}" |
45 |
- filesDir="${tomcat.classes}" |
46 |
- filesId="files.servlet-api" |
47 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
48 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
49 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
50 |
-- |
51 |
-+--> |
52 |
- <!-- JSP 2.3 Implementation JAR File --> |
53 |
-+<!-- |
54 |
- <jarIt jarfile="${jsp-api.jar}" |
55 |
- filesDir="${tomcat.classes}" |
56 |
- filesId="files.jsp-api" |
57 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
58 |
-+--> |
59 |
- |
60 |
- <!-- EL 3.0 Implementation JAR File --> |
61 |
-+<!-- |
62 |
- <jarIt jarfile="${el-api.jar}" |
63 |
- filesDir="${tomcat.classes}" |
64 |
- filesId="files.el-api" |
65 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
66 |
-+--> |
67 |
- |
68 |
- <!-- WebSocket 1.1 API JAR File --> |
69 |
- <jarIt jarfile="${websocket-api.jar}" |
70 |
-@@ -982,14 +987,14 @@ |
71 |
- |
72 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
73 |
- description="Default. Builds a working Tomcat instance"> |
74 |
-- |
75 |
-+<!-- |
76 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
77 |
- file="${tomcat-native.tar.gz}" /> |
78 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
79 |
- file="${commons-daemon.native.src.tgz}" /> |
80 |
- |
81 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
82 |
-- |
83 |
-+--> |
84 |
- <!-- Copy scripts --> |
85 |
- <copy todir="${tomcat.build}/bin"> |
86 |
- <fileset dir="bin"> |
87 |
-@@ -1049,7 +1054,7 @@ |
88 |
- <exclude name="${jdt.jar.filename}"/> |
89 |
- </fileset> |
90 |
- </delete> |
91 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
92 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
93 |
- |
94 |
- <!-- Add sources for examples --> |
95 |
- <antcall target="examples-sources" /> |
96 |
-@@ -1083,7 +1088,7 @@ |
97 |
- </javac> |
98 |
- </target> |
99 |
- |
100 |
-- <target name="build-tomcat-jdbc" depends="package"> |
101 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
102 |
- <!-- build the jdbc-pool jar and source jar--> |
103 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
104 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
105 |
-@@ -1098,7 +1103,7 @@ |
106 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
107 |
- </target> |
108 |
- |
109 |
-- <target name="build-tomcat-jdbc-src"> |
110 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
111 |
- <!-- build the jdbc-pool source jar--> |
112 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
113 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
114 |
-@@ -1202,10 +1207,11 @@ |
115 |
- |
116 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
117 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
118 |
-+<!-- |
119 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
120 |
- failonerror="false"/> |
121 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
122 |
-- |
123 |
-+--> |
124 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
125 |
- that needs to add entries. If there is more than one a more complex |
126 |
- solution will be required. --> |
127 |
-@@ -1579,7 +1585,7 @@ |
128 |
- |
129 |
- <target name="extras-webservices-prepare" |
130 |
- depends="extras-prepare" |
131 |
-- description="Prepare to build web services extras package"> |
132 |
-+ description="Prepare to build web services extras package" unless="noget"> |
133 |
- |
134 |
- <antcall target="downloadfile"> |
135 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
136 |
-@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
137 |
- |
138 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
139 |
- description="Create the Tomcat javadoc" > |
140 |
-+<!-- |
141 |
- <javadoc packagenames="javax.servlet.*" |
142 |
- excludepackagenames="javax.servlet.jsp.*" |
143 |
- sourcepath="${tomcat.dist}/src/java" |
144 |
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
145 |
- <path location="${ant.core.lib}"/> |
146 |
- </classpath> |
147 |
- </javadoc> |
148 |
-+--> |
149 |
- <javadoc packagenames="javax.websocket.*" |
150 |
- sourcepath="${tomcat.dist}/src/java" |
151 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
152 |
-@@ -1831,9 +1839,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
153 |
- <path refid="tomcat.webservices.classpath"/> |
154 |
- <path location="${ant.core.lib}"/> |
155 |
- </classpath> |
156 |
-+<!-- |
157 |
- <link href="../servletapi"/> |
158 |
- <link href="../jspapi"/> |
159 |
- <link href="../elapi"/> |
160 |
-+--> |
161 |
- <link href="../websocketapi"/> |
162 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
163 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
164 |
-@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" /> |
165 |
- </target> |
166 |
- |
167 |
- <target name="download-compile" |
168 |
-- description="Download (and build) components necessary to compile" > |
169 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
170 |
- |
171 |
- <antcall target="downloadfile-2"> |
172 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
173 |
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" /> |
174 |
- </target> |
175 |
- |
176 |
- <target name="download-test-compile" |
177 |
-- description="Download additional components for the tests" > |
178 |
-+ description="Download additional components for the tests" unless="noget"> |
179 |
- |
180 |
- <antcall target="downloadfile"> |
181 |
- <param name="sourcefile" value="${junit.loc}"/> |
182 |
-@@ -2665,7 +2675,7 @@ skip.installer property in build.properties" /> |
183 |
- </target> |
184 |
- |
185 |
- <target name="download-dist" |
186 |
-- description="Download additional components for a distribution" > |
187 |
-+ description="Download additional components for a distribution" unless="noget"> |
188 |
- |
189 |
- <antcall target="downloadzip-2"> |
190 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
191 |
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" /> |
192 |
- |
193 |
- <!-- =============== Utility Targets to support downloads ================ --> |
194 |
- |
195 |
-- <target name="setproxy" if="${proxy.use}"> |
196 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
197 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
198 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
199 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
200 |
- </target> |
201 |
- |
202 |
-- <target name="testexist"> |
203 |
-+ <target name="testexist" unless="noget"> |
204 |
- <echo message="Testing for ${destfile}"/> |
205 |
- <available file="${destfile}" property="exist"/> |
206 |
- </target> |
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 |
-@@ -2714,7 +2724,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 |
-@@ -2733,7 +2743,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 |
-@@ -2744,7 +2754,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 |
-@@ -2762,7 +2772,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 |
-@@ -2772,7 +2782,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 |
-@@ -2795,7 +2805,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 |
-@@ -2806,7 +2816,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 |
-@@ -2817,7 +2827,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-8.5.16.ebuild b/www-servers/tomcat/tomcat-8.5.16.ebuild |
287 |
deleted file mode 100644 |
288 |
index f76cec3287c..00000000000 |
289 |
--- a/www-servers/tomcat/tomcat-8.5.16.ebuild |
290 |
+++ /dev/null |
291 |
@@ -1,157 +0,0 @@ |
292 |
-# Copyright 1999-2017 Gentoo Foundation |
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.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
304 |
-HOMEPAGE="http://tomcat.apache.org/" |
305 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
306 |
- |
307 |
-LICENSE="Apache-2.0" |
308 |
-SLOT="8.5" |
309 |
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
310 |
-IUSE="extra-webapps" |
311 |
- |
312 |
-RESTRICT="test" # can we run them on a production system? |
313 |
- |
314 |
-ECJ_SLOT="4.5" |
315 |
-SAPI_SLOT="3.1" |
316 |
- |
317 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
318 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
319 |
-RDEPEND="${COMMON_DEP} |
320 |
- !<dev-java/tomcat-native-1.1.24 |
321 |
- >=virtual/jre-1.7" |
322 |
-DEPEND="${COMMON_DEP} |
323 |
- app-admin/pwgen |
324 |
- >=virtual/jdk-1.7 |
325 |
- test? ( |
326 |
- >=dev-java/ant-junit-1.9:0 |
327 |
- dev-java/easymock:3.2 |
328 |
- )" |
329 |
- |
330 |
-S=${WORKDIR}/${MY_P} |
331 |
- |
332 |
-pkg_setup() { |
333 |
- java-pkg-2_pkg_setup |
334 |
- enewgroup tomcat 265 |
335 |
- enewuser tomcat 265 -1 /dev/null tomcat |
336 |
-} |
337 |
- |
338 |
-src_prepare() { |
339 |
- default |
340 |
- |
341 |
- find -name '*.jar' -type f -delete -print || die |
342 |
- |
343 |
- # Remove bundled servlet-api |
344 |
- rm -rv java/javax/{el,servlet} || die |
345 |
- |
346 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
347 |
- |
348 |
- # For use of catalina.sh in netbeans |
349 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
350 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
351 |
- bin/catalina.sh || die |
352 |
- |
353 |
- java-pkg-2_src_prepare |
354 |
-} |
355 |
- |
356 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
357 |
- |
358 |
-EANT_BUILD_TARGET="deploy" |
359 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
360 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
361 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
362 |
-EANT_NEEDS_TOOLS="true" |
363 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
364 |
- |
365 |
-# revisions of the scripts |
366 |
-IM_REV="-r2" |
367 |
-INIT_REV="-r1" |
368 |
- |
369 |
-src_compile() { |
370 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
371 |
- java-pkg-2_src_compile |
372 |
-} |
373 |
- |
374 |
-src_test() { |
375 |
- java-pkg-2_src_test |
376 |
-} |
377 |
- |
378 |
-src_install() { |
379 |
- local dest="/usr/share/${PN}-${SLOT}" |
380 |
- |
381 |
- java-pkg_jarinto "${dest}"/bin |
382 |
- java-pkg_dojar output/build/bin/*.jar |
383 |
- exeinto "${dest}"/bin |
384 |
- doexe output/build/bin/*.sh |
385 |
- |
386 |
- java-pkg_jarinto "${dest}"/lib |
387 |
- java-pkg_dojar output/build/lib/*.jar |
388 |
- |
389 |
- dodoc RELEASE-NOTES RUNNING.txt |
390 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
391 |
- use source && java-pkg_dosrc java/* |
392 |
- |
393 |
- ### Webapps ### |
394 |
- |
395 |
- # add missing docBase |
396 |
- local apps="host-manager manager" |
397 |
- for app in ${apps}; do |
398 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
399 |
- output/build/webapps/${app}/META-INF/context.xml || die |
400 |
- done |
401 |
- |
402 |
- insinto "${dest}"/webapps |
403 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
404 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
405 |
- |
406 |
- ### Config ### |
407 |
- |
408 |
- # create "logs" directory in $CATALINA_BASE |
409 |
- # and set correct perms, see #458890 |
410 |
- dodir "${dest}"/logs |
411 |
- fperms 0750 "${dest}"/logs |
412 |
- |
413 |
- # replace the default pw with a random one, see #92281 |
414 |
- local randpw="$(pwgen -s -B 15 1)" |
415 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
416 |
- |
417 |
- # prepend gentoo.classpath to common.loader, see #453212 |
418 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
419 |
- |
420 |
- insinto "${dest}" |
421 |
- doins -r output/build/conf |
422 |
- |
423 |
- ### rc ### |
424 |
- |
425 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
426 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
427 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
428 |
- |
429 |
- insinto "${dest}"/gentoo |
430 |
- doins "${T}"/tomcat.conf |
431 |
- exeinto "${dest}"/gentoo |
432 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
433 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
434 |
-} |
435 |
- |
436 |
-pkg_postinst() { |
437 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
438 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
439 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
440 |
- |
441 |
- elog "To manage Tomcat instances, run:" |
442 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
443 |
- |
444 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
445 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
446 |
- |
447 |
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
448 |
-} |