1 |
commit: 61beaeeb0af2968e7e27c278bd5b33ea00849880 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 2 19:56:36 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 2 19:57:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61beaeeb |
7 |
|
8 |
www-servers/tomcat-8.{0.52,5.31}: removed obsolete |
9 |
|
10 |
Bug: https://bugs.gentoo.org/662168 |
11 |
Bug: https://bugs.gentoo.org/656044 |
12 |
Bug: https://bugs.gentoo.org/662892 |
13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
14 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
15 |
|
16 |
www-servers/tomcat/Manifest | 2 - |
17 |
www-servers/tomcat/tomcat-8.0.52.ebuild | 158 -------------------------------- |
18 |
www-servers/tomcat/tomcat-8.5.31.ebuild | 158 -------------------------------- |
19 |
3 files changed, 318 deletions(-) |
20 |
|
21 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
22 |
index 910ad262fe8..ac9b0360ab6 100644 |
23 |
--- a/www-servers/tomcat/Manifest |
24 |
+++ b/www-servers/tomcat/Manifest |
25 |
@@ -1,8 +1,6 @@ |
26 |
DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a |
27 |
DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc |
28 |
-DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56 |
29 |
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e |
30 |
-DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33 |
31 |
DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec |
32 |
DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee |
33 |
DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6 |
34 |
|
35 |
diff --git a/www-servers/tomcat/tomcat-8.0.52.ebuild b/www-servers/tomcat/tomcat-8.0.52.ebuild |
36 |
deleted file mode 100644 |
37 |
index 87b27e00535..00000000000 |
38 |
--- a/www-servers/tomcat/tomcat-8.0.52.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,158 +0,0 @@ |
41 |
-# Copyright 1999-2019 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=6 |
45 |
- |
46 |
-JAVA_PKG_IUSE="doc source test" |
47 |
- |
48 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
49 |
- |
50 |
-MY_P="apache-${P}-src" |
51 |
- |
52 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" |
53 |
-HOMEPAGE="https://tomcat.apache.org/" |
54 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
55 |
- |
56 |
-LICENSE="Apache-2.0" |
57 |
-SLOT="8" |
58 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
59 |
-IUSE="extra-webapps" |
60 |
- |
61 |
-RESTRICT="test" # can we run them on a production system? |
62 |
- |
63 |
-ECJ_SLOT="4.5" |
64 |
-SAPI_SLOT="3.1" |
65 |
- |
66 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
67 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
68 |
-RDEPEND="${COMMON_DEP} |
69 |
- !<dev-java/tomcat-native-1.1.24 |
70 |
- >=virtual/jre-1.7" |
71 |
-DEPEND="${COMMON_DEP} |
72 |
- app-admin/pwgen |
73 |
- >=virtual/jdk-1.7 |
74 |
- test? ( |
75 |
- >=dev-java/ant-junit-1.9:0 |
76 |
- dev-java/easymock:3.2 |
77 |
- )" |
78 |
- |
79 |
-S=${WORKDIR}/${MY_P} |
80 |
- |
81 |
-pkg_setup() { |
82 |
- java-pkg-2_pkg_setup |
83 |
- enewgroup tomcat 265 |
84 |
- enewuser tomcat 265 -1 /dev/null tomcat |
85 |
-} |
86 |
- |
87 |
-src_prepare() { |
88 |
- default |
89 |
- |
90 |
- find -name '*.jar' -type f -delete -print || die |
91 |
- |
92 |
- # Remove bundled servlet-api |
93 |
- rm -rv java/javax/{el,servlet} || die |
94 |
- |
95 |
- eapply "${FILESDIR}/${PN}-8.0.49-build.xml.patch" |
96 |
- |
97 |
- # For use of catalina.sh in netbeans |
98 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
99 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
100 |
- bin/catalina.sh || die |
101 |
- |
102 |
- java-pkg-2_src_prepare |
103 |
-} |
104 |
- |
105 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
106 |
- |
107 |
-EANT_BUILD_TARGET="deploy" |
108 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
109 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
110 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
111 |
-EANT_NEEDS_TOOLS="true" |
112 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
113 |
- |
114 |
-# revisions of the scripts |
115 |
-IM_REV="-r2" |
116 |
-INIT_REV="-r1" |
117 |
- |
118 |
-src_compile() { |
119 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
120 |
- java-pkg-2_src_compile |
121 |
-} |
122 |
- |
123 |
-src_test() { |
124 |
- java-pkg-2_src_test |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- local dest="/usr/share/${PN}-${SLOT}" |
129 |
- |
130 |
- java-pkg_jarinto "${dest}"/bin |
131 |
- java-pkg_dojar output/build/bin/*.jar |
132 |
- exeinto "${dest}"/bin |
133 |
- doexe output/build/bin/*.sh |
134 |
- |
135 |
- java-pkg_jarinto "${dest}"/lib |
136 |
- java-pkg_dojar output/build/lib/*.jar |
137 |
- |
138 |
- dodoc RELEASE-NOTES RUNNING.txt |
139 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
140 |
- use source && java-pkg_dosrc java/* |
141 |
- |
142 |
- ### Webapps ### |
143 |
- |
144 |
- # add missing docBase |
145 |
- local apps="host-manager manager" |
146 |
- for app in ${apps}; do |
147 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
148 |
- output/build/webapps/${app}/META-INF/context.xml || die |
149 |
- done |
150 |
- |
151 |
- insinto "${dest}"/webapps |
152 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
153 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
154 |
- |
155 |
- ### Config ### |
156 |
- |
157 |
- # create "logs" directory in $CATALINA_BASE |
158 |
- # and set correct perms, see #458890 |
159 |
- dodir "${dest}"/logs |
160 |
- fperms 0750 "${dest}"/logs |
161 |
- |
162 |
- # replace the default pw with a random one, see #92281 |
163 |
- local randpw="$(pwgen -s -B 15 1)" |
164 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
165 |
- |
166 |
- # prepend gentoo.classpath to common.loader, see #453212 |
167 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
168 |
- |
169 |
- insinto "${dest}" |
170 |
- doins -r output/build/conf |
171 |
- |
172 |
- ### rc ### |
173 |
- |
174 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
175 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
176 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
177 |
- |
178 |
- insinto "${dest}"/gentoo |
179 |
- doins "${T}"/tomcat.conf |
180 |
- exeinto "${dest}"/gentoo |
181 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
182 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
183 |
-} |
184 |
- |
185 |
-pkg_postinst() { |
186 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
187 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
188 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
189 |
- |
190 |
- elog "To manage Tomcat instances, run:" |
191 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
192 |
- |
193 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
194 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
195 |
- |
196 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
197 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
198 |
-} |
199 |
|
200 |
diff --git a/www-servers/tomcat/tomcat-8.5.31.ebuild b/www-servers/tomcat/tomcat-8.5.31.ebuild |
201 |
deleted file mode 100644 |
202 |
index 86bc478dfa6..00000000000 |
203 |
--- a/www-servers/tomcat/tomcat-8.5.31.ebuild |
204 |
+++ /dev/null |
205 |
@@ -1,158 +0,0 @@ |
206 |
-# Copyright 1999-2019 Gentoo Authors |
207 |
-# Distributed under the terms of the GNU General Public License v2 |
208 |
- |
209 |
-EAPI=6 |
210 |
- |
211 |
-JAVA_PKG_IUSE="doc source test" |
212 |
- |
213 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
214 |
- |
215 |
-MY_P="apache-${P}-src" |
216 |
- |
217 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
218 |
-HOMEPAGE="https://tomcat.apache.org/" |
219 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
220 |
- |
221 |
-LICENSE="Apache-2.0" |
222 |
-SLOT="8.5" |
223 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
224 |
-IUSE="extra-webapps" |
225 |
- |
226 |
-RESTRICT="test" # can we run them on a production system? |
227 |
- |
228 |
-ECJ_SLOT="4.5" |
229 |
-SAPI_SLOT="3.1" |
230 |
- |
231 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
232 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
233 |
-RDEPEND="${COMMON_DEP} |
234 |
- !<dev-java/tomcat-native-1.1.24 |
235 |
- >=virtual/jre-1.7" |
236 |
-DEPEND="${COMMON_DEP} |
237 |
- app-admin/pwgen |
238 |
- >=virtual/jdk-1.7 |
239 |
- test? ( |
240 |
- >=dev-java/ant-junit-1.9:0 |
241 |
- dev-java/easymock:3.2 |
242 |
- )" |
243 |
- |
244 |
-S=${WORKDIR}/${MY_P} |
245 |
- |
246 |
-pkg_setup() { |
247 |
- java-pkg-2_pkg_setup |
248 |
- enewgroup tomcat 265 |
249 |
- enewuser tomcat 265 -1 /dev/null tomcat |
250 |
-} |
251 |
- |
252 |
-src_prepare() { |
253 |
- default |
254 |
- |
255 |
- find -name '*.jar' -type f -delete -print || die |
256 |
- |
257 |
- # Remove bundled servlet-api |
258 |
- rm -rv java/javax/{el,servlet} || die |
259 |
- |
260 |
- eapply "${FILESDIR}/${PN}-8.5.27-build.xml.patch" |
261 |
- |
262 |
- # For use of catalina.sh in netbeans |
263 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
264 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
265 |
- bin/catalina.sh || die |
266 |
- |
267 |
- java-pkg-2_src_prepare |
268 |
-} |
269 |
- |
270 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
271 |
- |
272 |
-EANT_BUILD_TARGET="deploy" |
273 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
274 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
275 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
276 |
-EANT_NEEDS_TOOLS="true" |
277 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
278 |
- |
279 |
-# revisions of the scripts |
280 |
-IM_REV="-r2" |
281 |
-INIT_REV="-r1" |
282 |
- |
283 |
-src_compile() { |
284 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
285 |
- java-pkg-2_src_compile |
286 |
-} |
287 |
- |
288 |
-src_test() { |
289 |
- java-pkg-2_src_test |
290 |
-} |
291 |
- |
292 |
-src_install() { |
293 |
- local dest="/usr/share/${PN}-${SLOT}" |
294 |
- |
295 |
- java-pkg_jarinto "${dest}"/bin |
296 |
- java-pkg_dojar output/build/bin/*.jar |
297 |
- exeinto "${dest}"/bin |
298 |
- doexe output/build/bin/*.sh |
299 |
- |
300 |
- java-pkg_jarinto "${dest}"/lib |
301 |
- java-pkg_dojar output/build/lib/*.jar |
302 |
- |
303 |
- dodoc RELEASE-NOTES RUNNING.txt |
304 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
305 |
- use source && java-pkg_dosrc java/* |
306 |
- |
307 |
- ### Webapps ### |
308 |
- |
309 |
- # add missing docBase |
310 |
- local apps="host-manager manager" |
311 |
- for app in ${apps}; do |
312 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
313 |
- output/build/webapps/${app}/META-INF/context.xml || die |
314 |
- done |
315 |
- |
316 |
- insinto "${dest}"/webapps |
317 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
318 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
319 |
- |
320 |
- ### Config ### |
321 |
- |
322 |
- # create "logs" directory in $CATALINA_BASE |
323 |
- # and set correct perms, see #458890 |
324 |
- dodir "${dest}"/logs |
325 |
- fperms 0750 "${dest}"/logs |
326 |
- |
327 |
- # replace the default pw with a random one, see #92281 |
328 |
- local randpw="$(pwgen -s -B 15 1)" |
329 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
330 |
- |
331 |
- # prepend gentoo.classpath to common.loader, see #453212 |
332 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
333 |
- |
334 |
- insinto "${dest}" |
335 |
- doins -r output/build/conf |
336 |
- |
337 |
- ### rc ### |
338 |
- |
339 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
340 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
341 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
342 |
- |
343 |
- insinto "${dest}"/gentoo |
344 |
- doins "${T}"/tomcat.conf |
345 |
- exeinto "${dest}"/gentoo |
346 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
347 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
348 |
-} |
349 |
- |
350 |
-pkg_postinst() { |
351 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
352 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
353 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
354 |
- |
355 |
- elog "To manage Tomcat instances, run:" |
356 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
357 |
- |
358 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
359 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
360 |
- |
361 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
362 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
363 |
-} |