1 |
commit: 96b0481565c1b8b1cc409b871417384eb944b748 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 30 09:13:29 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 09:13:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b04815 |
7 |
|
8 |
www-servers/tomcat: removed obsolete 7.0.100 and 8.5.51 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 2 - |
14 |
.../tomcat/files/tomcat-7.0.94-build.xml.patch | 163 --------------------- |
15 |
www-servers/tomcat/tomcat-7.0.100.ebuild | 146 ------------------ |
16 |
www-servers/tomcat/tomcat-8.5.51.ebuild | 158 -------------------- |
17 |
4 files changed, 469 deletions(-) |
18 |
|
19 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
20 |
index ce3cffff02e..50232614a86 100644 |
21 |
--- a/www-servers/tomcat/Manifest |
22 |
+++ b/www-servers/tomcat/Manifest |
23 |
@@ -1,6 +1,4 @@ |
24 |
-DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57 |
25 |
DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b |
26 |
-DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592 |
27 |
DIST apache-tomcat-8.5.53-src.tar.gz 5676477 BLAKE2B 284ddc3b3d491a57aac31fc59a9c7d80bdb11efb410ab53eea5d3a0a754507203de287eff0a621d02bfea581b45b860598c8ab95d529ad18790fe381f5518cca SHA512 d78613042a9e4caa5b5eeebd2589383ef10312698e535e2c8f82e40c7b3d793ea6cac50f346316a84f4b47ad330f82c7a4f0e4a3d2f0d449f1d4dad9c6d5e267 |
28 |
DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2 |
29 |
DIST apache-tomcat-9.0.33-src.tar.gz 5831264 BLAKE2B 7ef5b28dfc4f24003075012cfe6403060dfc908386577ea3dbab3d7a4eca1d22cdcaab3f821079a90d9407030bedf657f5abd9829d643f699ba875b7b702f0a3 SHA512 73ffb36dc7331bf9e455b599b128c51da8f90222bd3cb296e211d266c18964bf66004524725acd6d3e29099d2fdc3180892c228b2a00b06544455240bf05c9b0 |
30 |
|
31 |
diff --git a/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch |
32 |
deleted file mode 100644 |
33 |
index 832ce0be4a2..00000000000 |
34 |
--- a/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch |
35 |
+++ /dev/null |
36 |
@@ -1,163 +0,0 @@ |
37 |
-diff --git a/build.xml b/build.xml |
38 |
-index 92d8b92..790d8fd 100644 |
39 |
---- a/build.xml |
40 |
-+++ b/build.xml |
41 |
-@@ -685,12 +685,14 @@ |
42 |
- </fileset> |
43 |
- </copy> |
44 |
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> |
45 |
-+<!-- |
46 |
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> |
47 |
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> |
48 |
- <include name="*" /> |
49 |
- <exclude name="jspxml*" /> |
50 |
- </fileset> |
51 |
- </copy> |
52 |
-+--> |
53 |
- |
54 |
- </target> |
55 |
- |
56 |
-@@ -741,26 +743,32 @@ |
57 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
58 |
- |
59 |
- <!-- Servlet 3.0 Implementation JAR File --> |
60 |
-+<!-- |
61 |
- <jarIt jarfile="${servlet-api.jar}" |
62 |
- filesDir="${tomcat.classes}" |
63 |
- filesId="files.servlet-api" |
64 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
65 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
66 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
67 |
-+--> |
68 |
- |
69 |
- <!-- JSP 2.2 Implementation JAR File --> |
70 |
-+<!-- |
71 |
- <jarIt jarfile="${jsp-api.jar}" |
72 |
- filesDir="${tomcat.classes}" |
73 |
- filesId="files.jsp-api" |
74 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" |
75 |
- notice="${tomcat.manifests}/jsp-api.jar.notice" |
76 |
- license="${tomcat.manifests}/jsp-api.jar.license" /> |
77 |
-+--> |
78 |
- |
79 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
80 |
-+<!-- |
81 |
- <jarIt jarfile="${el-api.jar}" |
82 |
- filesDir="${tomcat.classes}" |
83 |
- filesId="files.el-api" |
84 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
85 |
-+--> |
86 |
- |
87 |
- <!-- Bootstrap JAR File --> |
88 |
- <jarIt jarfile="${bootstrap.jar}" |
89 |
-@@ -819,9 +827,9 @@ |
90 |
- filesId="files.jasper-el" /> |
91 |
- |
92 |
- <!-- Re-packaged Apache Commons DBCP 1--> |
93 |
-- <jarIt jarfile="${tomcat-dbcp.jar}" |
94 |
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" |
95 |
- filesDir="${tomcat.classes}" |
96 |
-- filesId="files.tomcat-dbcp" /> |
97 |
-+ filesId="files.tomcat-dbcp" /> --> |
98 |
- |
99 |
- <!-- i18n JARs --> |
100 |
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar" |
101 |
-@@ -1022,9 +1030,9 @@ |
102 |
- |
103 |
- <target name="deploy" depends="package,build-docs,compile-webapp-examples" |
104 |
- description="Default. Builds a working Tomcat instance"> |
105 |
-- |
106 |
-+<!-- |
107 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
108 |
-- |
109 |
-+--> |
110 |
- <!-- Copy scripts --> |
111 |
- <copy todir="${tomcat.build}/bin"> |
112 |
- <fileset dir="bin"> |
113 |
-@@ -1083,7 +1091,7 @@ |
114 |
- <exclude name="${jdt.jar.filename}"/> |
115 |
- </fileset> |
116 |
- </delete> |
117 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
118 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
119 |
- |
120 |
- <!-- Add sources for examples --> |
121 |
- <antcall target="examples-sources" /> |
122 |
-@@ -1728,7 +1736,7 @@ |
123 |
- |
124 |
- <target name="extras-webservices-prepare" |
125 |
- depends="extras-prepare" |
126 |
-- description="Prepare to build web services extras package"> |
127 |
-+ description="Prepare to build web services extras package" unless="noget"> |
128 |
- |
129 |
- <antcall target="downloadfile"> |
130 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
131 |
-@@ -1925,11 +1933,12 @@ |
132 |
- </copy> |
133 |
- |
134 |
- <!-- Source bundles for native components --> |
135 |
-+<!-- |
136 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
137 |
- file="${tomcat-native.tar.gz}" /> |
138 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
139 |
- file="${commons-daemon.native.src.tgz}" /> |
140 |
-- |
141 |
-+--> |
142 |
- <!-- platform README files --> |
143 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
144 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
145 |
-@@ -1941,6 +1950,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
146 |
- description="Create the Tomcat javadoc" > |
147 |
- <fail unless="java.7.home" |
148 |
- message="The java.7.home property must be set for javadoc build"/> |
149 |
-+<!-- |
150 |
- <javadoc packagenames="javax.servlet.*" |
151 |
- excludepackagenames="javax.servlet.jsp.*" |
152 |
- sourcepath="${tomcat.dist}/src/java" |
153 |
-@@ -2005,6 +2015,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
154 |
- <path location="${ant.core.lib}"/> |
155 |
- </classpath> |
156 |
- </javadoc> |
157 |
-+--> |
158 |
- <javadoc packagenames="javax.websocket.*" |
159 |
- sourcepath="${tomcat.dist}/src/java" |
160 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
161 |
-@@ -2045,9 +2056,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
162 |
- <path refid="tomcat.webservices.classpath"/> |
163 |
- <path location="${ant.core.lib}"/> |
164 |
- </classpath> |
165 |
-+<!-- |
166 |
- <link href="../servletapi"/> |
167 |
- <link href="../jspapi"/> |
168 |
- <link href="../elapi"/> |
169 |
-+--> |
170 |
- <link href="../websocketapi"/> |
171 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
172 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
173 |
-@@ -2658,7 +2671,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
174 |
- </target> |
175 |
- |
176 |
- <target name="download-compile" |
177 |
-- description="Download components necessary to compile" > |
178 |
-+ description="Download components necessary to compile" unless="noget" > |
179 |
- |
180 |
- <!-- Download Commons Daemon --> |
181 |
- <antcall target="downloadgz-2"> |
182 |
-@@ -2683,7 +2696,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
183 |
- </target> |
184 |
- |
185 |
- <target name="download-test-compile" |
186 |
-- description="Download additional components for the tests" > |
187 |
-+ description="Download additional components for the tests" unless="noget"> |
188 |
- |
189 |
- <antcall target="downloadfile"> |
190 |
- <param name="sourcefile" value="${junit.loc}"/> |
191 |
-@@ -2747,7 +2760,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
192 |
- </target> |
193 |
- |
194 |
- <target name="download-dist" |
195 |
-- description="Download additional components for a distribution" > |
196 |
-+ description="Download additional components for a distribution" unless="noget"> |
197 |
- |
198 |
- <antcall target="downloadfile-2"> |
199 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
200 |
|
201 |
diff --git a/www-servers/tomcat/tomcat-7.0.100.ebuild b/www-servers/tomcat/tomcat-7.0.100.ebuild |
202 |
deleted file mode 100644 |
203 |
index 8fa804171b4..00000000000 |
204 |
--- a/www-servers/tomcat/tomcat-7.0.100.ebuild |
205 |
+++ /dev/null |
206 |
@@ -1,146 +0,0 @@ |
207 |
-# Copyright 1999-2020 Gentoo Authors |
208 |
-# Distributed under the terms of the GNU General Public License v2 |
209 |
- |
210 |
-EAPI=7 |
211 |
- |
212 |
-JAVA_PKG_IUSE="doc source test" |
213 |
- |
214 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
215 |
- |
216 |
-MY_P="apache-${P}-src" |
217 |
- |
218 |
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
219 |
-HOMEPAGE="https://tomcat.apache.org/" |
220 |
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
221 |
- |
222 |
-LICENSE="Apache-2.0" |
223 |
-SLOT="7" |
224 |
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
225 |
-IUSE="extra-webapps websockets" |
226 |
- |
227 |
-RESTRICT="test" # can we run them on a production system? |
228 |
- |
229 |
-ECJ_SLOT="4.5" |
230 |
-SAPI_SLOT="3.0" |
231 |
- |
232 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
233 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
234 |
-RDEPEND="${COMMON_DEP} |
235 |
- virtual/jre" |
236 |
-DEPEND="${COMMON_DEP} |
237 |
- virtual/jdk:1.8 |
238 |
- test? ( dev-java/ant-junit:0 )" |
239 |
- |
240 |
-S=${WORKDIR}/${MY_P} |
241 |
- |
242 |
-pkg_setup() { |
243 |
- java-pkg-2_pkg_setup |
244 |
- enewgroup tomcat 265 |
245 |
- enewuser tomcat 265 -1 /dev/null tomcat |
246 |
-} |
247 |
- |
248 |
-src_prepare() { |
249 |
- default |
250 |
- |
251 |
- # Remove bundled servlet-api |
252 |
- rm -rv java/javax/{el,servlet} || die |
253 |
- |
254 |
- java-pkg_clean |
255 |
- |
256 |
- eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch" |
257 |
- |
258 |
- # For use of catalina.sh in netbeans |
259 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
260 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
261 |
- bin/catalina.sh || die |
262 |
- |
263 |
- java-pkg-2_src_prepare |
264 |
-} |
265 |
- |
266 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
267 |
- |
268 |
-EANT_BUILD_TARGET="deploy" |
269 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
270 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
271 |
-EANT_NEEDS_TOOLS="true" |
272 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
273 |
- |
274 |
-# revisions of the scripts |
275 |
-IM_REV="-r1" |
276 |
-INIT_REV="-r1" |
277 |
- |
278 |
-src_compile() { |
279 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
280 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
281 |
- java-pkg-2_src_compile |
282 |
-} |
283 |
- |
284 |
-src_test() { |
285 |
- java-pkg-2_src_test |
286 |
-} |
287 |
- |
288 |
-src_install() { |
289 |
- local dest="/usr/share/${PN}-${SLOT}" |
290 |
- |
291 |
- java-pkg_jarinto "${dest}"/bin |
292 |
- java-pkg_dojar output/build/bin/*.jar |
293 |
- exeinto "${dest}"/bin |
294 |
- doexe output/build/bin/*.sh |
295 |
- |
296 |
- java-pkg_jarinto "${dest}"/lib |
297 |
- java-pkg_dojar output/build/lib/*.jar |
298 |
- |
299 |
- dodoc RELEASE-NOTES RUNNING.txt |
300 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
301 |
- use source && java-pkg_dosrc java/* |
302 |
- |
303 |
- ### Webapps ### |
304 |
- |
305 |
- insinto "${dest}"/webapps |
306 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
307 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
308 |
- |
309 |
- ### Config ### |
310 |
- |
311 |
- # create "logs" directory in $CATALINA_BASE |
312 |
- # and set correct perms, see #458890 |
313 |
- dodir "${dest}"/logs |
314 |
- fperms 0750 "${dest}"/logs |
315 |
- |
316 |
- # replace the default pw with a random one, see #92281 |
317 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
318 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
319 |
- |
320 |
- # prepend gentoo.classpath to common.loader, see #453212 |
321 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
322 |
- |
323 |
- insinto "${dest}" |
324 |
- doins -r output/build/conf |
325 |
- |
326 |
- ### rc ### |
327 |
- |
328 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
329 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
330 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
331 |
- |
332 |
- insinto "${dest}"/gentoo |
333 |
- doins "${T}"/tomcat.conf |
334 |
- exeinto "${dest}"/gentoo |
335 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
336 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
337 |
-} |
338 |
- |
339 |
-pkg_postinst() { |
340 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
341 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
342 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
343 |
- |
344 |
- elog "To manage Tomcat instances, run:" |
345 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
346 |
- |
347 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
348 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
349 |
- |
350 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
351 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
352 |
-} |
353 |
|
354 |
diff --git a/www-servers/tomcat/tomcat-8.5.51.ebuild b/www-servers/tomcat/tomcat-8.5.51.ebuild |
355 |
deleted file mode 100644 |
356 |
index 688cb761576..00000000000 |
357 |
--- a/www-servers/tomcat/tomcat-8.5.51.ebuild |
358 |
+++ /dev/null |
359 |
@@ -1,158 +0,0 @@ |
360 |
-# Copyright 1999-2020 Gentoo Authors |
361 |
-# Distributed under the terms of the GNU General Public License v2 |
362 |
- |
363 |
-EAPI=7 |
364 |
- |
365 |
-JAVA_PKG_IUSE="doc source test" |
366 |
- |
367 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
368 |
- |
369 |
-MY_P="apache-${P}-src" |
370 |
- |
371 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
372 |
-HOMEPAGE="https://tomcat.apache.org/" |
373 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
374 |
- |
375 |
-LICENSE="Apache-2.0" |
376 |
-SLOT="8.5" |
377 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
378 |
-IUSE="extra-webapps" |
379 |
- |
380 |
-RESTRICT="test" # can we run them on a production system? |
381 |
- |
382 |
-ECJ_SLOT="4.5" |
383 |
-SAPI_SLOT="3.1" |
384 |
- |
385 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
386 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
387 |
-RDEPEND="${COMMON_DEP} |
388 |
- virtual/jre" |
389 |
-DEPEND="${COMMON_DEP} |
390 |
- app-admin/pwgen |
391 |
- >=dev-java/ant-core-1.9.13 |
392 |
- virtual/jdk:1.8 |
393 |
- test? ( |
394 |
- >=dev-java/ant-junit-1.9:0 |
395 |
- dev-java/easymock:3.2 |
396 |
- )" |
397 |
- |
398 |
-S=${WORKDIR}/${MY_P} |
399 |
- |
400 |
-pkg_setup() { |
401 |
- java-pkg-2_pkg_setup |
402 |
- enewgroup tomcat 265 |
403 |
- enewuser tomcat 265 -1 /dev/null tomcat |
404 |
-} |
405 |
- |
406 |
-src_prepare() { |
407 |
- default |
408 |
- |
409 |
- find -name '*.jar' -type f -delete -print || die |
410 |
- |
411 |
- # Remove bundled servlet-api |
412 |
- rm -rv java/javax/{el,servlet} || die |
413 |
- |
414 |
- eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch" |
415 |
- |
416 |
- # For use of catalina.sh in netbeans |
417 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
418 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
419 |
- bin/catalina.sh || die |
420 |
- |
421 |
- java-pkg-2_src_prepare |
422 |
-} |
423 |
- |
424 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
425 |
- |
426 |
-EANT_BUILD_TARGET="deploy" |
427 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
428 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
429 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
430 |
-EANT_NEEDS_TOOLS="true" |
431 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
432 |
- |
433 |
-# revisions of the scripts |
434 |
-IM_REV="-r2" |
435 |
-INIT_REV="-r1" |
436 |
- |
437 |
-src_compile() { |
438 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
439 |
- java-pkg-2_src_compile |
440 |
-} |
441 |
- |
442 |
-src_test() { |
443 |
- java-pkg-2_src_test |
444 |
-} |
445 |
- |
446 |
-src_install() { |
447 |
- local dest="/usr/share/${PN}-${SLOT}" |
448 |
- |
449 |
- java-pkg_jarinto "${dest}"/bin |
450 |
- java-pkg_dojar output/build/bin/*.jar |
451 |
- exeinto "${dest}"/bin |
452 |
- doexe output/build/bin/*.sh |
453 |
- |
454 |
- java-pkg_jarinto "${dest}"/lib |
455 |
- java-pkg_dojar output/build/lib/*.jar |
456 |
- |
457 |
- dodoc RELEASE-NOTES RUNNING.txt |
458 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
459 |
- use source && java-pkg_dosrc java/* |
460 |
- |
461 |
- ### Webapps ### |
462 |
- |
463 |
- # add missing docBase |
464 |
- local apps="host-manager manager" |
465 |
- for app in ${apps}; do |
466 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
467 |
- output/build/webapps/${app}/META-INF/context.xml || die |
468 |
- done |
469 |
- |
470 |
- insinto "${dest}"/webapps |
471 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
472 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
473 |
- |
474 |
- ### Config ### |
475 |
- |
476 |
- # create "logs" directory in $CATALINA_BASE |
477 |
- # and set correct perms, see #458890 |
478 |
- dodir "${dest}"/logs |
479 |
- fperms 0750 "${dest}"/logs |
480 |
- |
481 |
- # replace the default pw with a random one, see #92281 |
482 |
- local randpw="$(pwgen -s -B 15 1)" |
483 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
484 |
- |
485 |
- # prepend gentoo.classpath to common.loader, see #453212 |
486 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
487 |
- |
488 |
- insinto "${dest}" |
489 |
- doins -r output/build/conf |
490 |
- |
491 |
- ### rc ### |
492 |
- |
493 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
494 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
495 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
496 |
- |
497 |
- insinto "${dest}"/gentoo |
498 |
- doins "${T}"/tomcat.conf |
499 |
- exeinto "${dest}"/gentoo |
500 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
501 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
502 |
-} |
503 |
- |
504 |
-pkg_postinst() { |
505 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
506 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
507 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
508 |
- |
509 |
- elog "To manage Tomcat instances, run:" |
510 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
511 |
- |
512 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
513 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
514 |
- |
515 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
516 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
517 |
-} |