1 |
commit: 90a47851c1e454e373195a56dcf8ce5791ea1f89 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 21 07:19:55 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 21 07:45:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a47851 |
7 |
|
8 |
www-servers/tomcat: removed obsolete |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 4 - |
14 |
www-servers/tomcat/tomcat-7.0.94.ebuild | 147 -------------------------- |
15 |
www-servers/tomcat/tomcat-8.5.42.ebuild | 159 ---------------------------- |
16 |
www-servers/tomcat/tomcat-9.0.21.ebuild | 182 -------------------------------- |
17 |
www-servers/tomcat/tomcat-9.0.22.ebuild | 182 -------------------------------- |
18 |
5 files changed, 674 deletions(-) |
19 |
|
20 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
21 |
index b30d314f7db..b2f4a6f430d 100644 |
22 |
--- a/www-servers/tomcat/Manifest |
23 |
+++ b/www-servers/tomcat/Manifest |
24 |
@@ -1,11 +1,7 @@ |
25 |
-DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8 SHA512 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139 |
26 |
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 |
27 |
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e |
28 |
-DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05 |
29 |
DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7 |
30 |
DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c SHA512 1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a |
31 |
-DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f |
32 |
-DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf |
33 |
DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31 |
34 |
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 |
35 |
DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef |
36 |
|
37 |
diff --git a/www-servers/tomcat/tomcat-7.0.94.ebuild b/www-servers/tomcat/tomcat-7.0.94.ebuild |
38 |
deleted file mode 100644 |
39 |
index ead93c99a5d..00000000000 |
40 |
--- a/www-servers/tomcat/tomcat-7.0.94.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,147 +0,0 @@ |
43 |
-# Copyright 1999-2019 Gentoo Authors |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=6 |
47 |
- |
48 |
-JAVA_PKG_IUSE="doc source test" |
49 |
- |
50 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
51 |
- |
52 |
-MY_P="apache-${P}-src" |
53 |
- |
54 |
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" |
55 |
-HOMEPAGE="https://tomcat.apache.org/" |
56 |
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
57 |
- |
58 |
-LICENSE="Apache-2.0" |
59 |
-SLOT="7" |
60 |
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
61 |
-IUSE="extra-webapps websockets" |
62 |
- |
63 |
-RESTRICT="test" # can we run them on a production system? |
64 |
- |
65 |
-ECJ_SLOT="4.5" |
66 |
-SAPI_SLOT="3.0" |
67 |
- |
68 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
69 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
70 |
-RDEPEND="${COMMON_DEP} |
71 |
- virtual/jre |
72 |
- !<dev-java/tomcat-native-1.1.24" |
73 |
-DEPEND="${COMMON_DEP} |
74 |
- virtual/jdk:1.8 |
75 |
- test? ( dev-java/ant-junit:0 )" |
76 |
- |
77 |
-S=${WORKDIR}/${MY_P} |
78 |
- |
79 |
-pkg_setup() { |
80 |
- java-pkg-2_pkg_setup |
81 |
- enewgroup tomcat 265 |
82 |
- enewuser tomcat 265 -1 /dev/null tomcat |
83 |
-} |
84 |
- |
85 |
-src_prepare() { |
86 |
- default |
87 |
- |
88 |
- # Remove bundled servlet-api |
89 |
- rm -rv java/javax/{el,servlet} || die |
90 |
- |
91 |
- java-pkg_clean |
92 |
- |
93 |
- eapply "${FILESDIR}/${P}-build.xml.patch" |
94 |
- |
95 |
- # For use of catalina.sh in netbeans |
96 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
97 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
98 |
- bin/catalina.sh || die |
99 |
- |
100 |
- java-pkg-2_src_prepare |
101 |
-} |
102 |
- |
103 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
104 |
- |
105 |
-EANT_BUILD_TARGET="deploy" |
106 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
107 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
108 |
-EANT_NEEDS_TOOLS="true" |
109 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
110 |
- |
111 |
-# revisions of the scripts |
112 |
-IM_REV="-r1" |
113 |
-INIT_REV="-r1" |
114 |
- |
115 |
-src_compile() { |
116 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
117 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
118 |
- java-pkg-2_src_compile |
119 |
-} |
120 |
- |
121 |
-src_test() { |
122 |
- java-pkg-2_src_test |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- local dest="/usr/share/${PN}-${SLOT}" |
127 |
- |
128 |
- java-pkg_jarinto "${dest}"/bin |
129 |
- java-pkg_dojar output/build/bin/*.jar |
130 |
- exeinto "${dest}"/bin |
131 |
- doexe output/build/bin/*.sh |
132 |
- |
133 |
- java-pkg_jarinto "${dest}"/lib |
134 |
- java-pkg_dojar output/build/lib/*.jar |
135 |
- |
136 |
- dodoc RELEASE-NOTES RUNNING.txt |
137 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
138 |
- use source && java-pkg_dosrc java/* |
139 |
- |
140 |
- ### Webapps ### |
141 |
- |
142 |
- insinto "${dest}"/webapps |
143 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
144 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
145 |
- |
146 |
- ### Config ### |
147 |
- |
148 |
- # create "logs" directory in $CATALINA_BASE |
149 |
- # and set correct perms, see #458890 |
150 |
- dodir "${dest}"/logs |
151 |
- fperms 0750 "${dest}"/logs |
152 |
- |
153 |
- # replace the default pw with a random one, see #92281 |
154 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
155 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
156 |
- |
157 |
- # prepend gentoo.classpath to common.loader, see #453212 |
158 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
159 |
- |
160 |
- insinto "${dest}" |
161 |
- doins -r output/build/conf |
162 |
- |
163 |
- ### rc ### |
164 |
- |
165 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
166 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
167 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
168 |
- |
169 |
- insinto "${dest}"/gentoo |
170 |
- doins "${T}"/tomcat.conf |
171 |
- exeinto "${dest}"/gentoo |
172 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
173 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
174 |
-} |
175 |
- |
176 |
-pkg_postinst() { |
177 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
178 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
179 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
180 |
- |
181 |
- elog "To manage Tomcat instances, run:" |
182 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
183 |
- |
184 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
185 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
186 |
- |
187 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
188 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
189 |
-} |
190 |
|
191 |
diff --git a/www-servers/tomcat/tomcat-8.5.42.ebuild b/www-servers/tomcat/tomcat-8.5.42.ebuild |
192 |
deleted file mode 100644 |
193 |
index 542077cf492..00000000000 |
194 |
--- a/www-servers/tomcat/tomcat-8.5.42.ebuild |
195 |
+++ /dev/null |
196 |
@@ -1,159 +0,0 @@ |
197 |
-# Copyright 1999-2019 Gentoo Authors |
198 |
-# Distributed under the terms of the GNU General Public License v2 |
199 |
- |
200 |
-EAPI=6 |
201 |
- |
202 |
-JAVA_PKG_IUSE="doc source test" |
203 |
- |
204 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
205 |
- |
206 |
-MY_P="apache-${P}-src" |
207 |
- |
208 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
209 |
-HOMEPAGE="https://tomcat.apache.org/" |
210 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
211 |
- |
212 |
-LICENSE="Apache-2.0" |
213 |
-SLOT="8.5" |
214 |
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
215 |
-IUSE="extra-webapps" |
216 |
- |
217 |
-RESTRICT="test" # can we run them on a production system? |
218 |
- |
219 |
-ECJ_SLOT="4.5" |
220 |
-SAPI_SLOT="3.1" |
221 |
- |
222 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
223 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
224 |
-RDEPEND="${COMMON_DEP} |
225 |
- !<dev-java/tomcat-native-1.1.24 |
226 |
- >=virtual/jre-1.7" |
227 |
-DEPEND="${COMMON_DEP} |
228 |
- app-admin/pwgen |
229 |
- >=dev-java/ant-core-1.9.13 |
230 |
- >=virtual/jdk-1.7 |
231 |
- test? ( |
232 |
- >=dev-java/ant-junit-1.9:0 |
233 |
- dev-java/easymock:3.2 |
234 |
- )" |
235 |
- |
236 |
-S=${WORKDIR}/${MY_P} |
237 |
- |
238 |
-pkg_setup() { |
239 |
- java-pkg-2_pkg_setup |
240 |
- enewgroup tomcat 265 |
241 |
- enewuser tomcat 265 -1 /dev/null tomcat |
242 |
-} |
243 |
- |
244 |
-src_prepare() { |
245 |
- default |
246 |
- |
247 |
- find -name '*.jar' -type f -delete -print || die |
248 |
- |
249 |
- # Remove bundled servlet-api |
250 |
- rm -rv java/javax/{el,servlet} || die |
251 |
- |
252 |
- eapply "${FILESDIR}/${PN}-8.5.40-build.xml.patch" |
253 |
- |
254 |
- # For use of catalina.sh in netbeans |
255 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
256 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
257 |
- bin/catalina.sh || die |
258 |
- |
259 |
- java-pkg-2_src_prepare |
260 |
-} |
261 |
- |
262 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
263 |
- |
264 |
-EANT_BUILD_TARGET="deploy" |
265 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
266 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
267 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
268 |
-EANT_NEEDS_TOOLS="true" |
269 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
270 |
- |
271 |
-# revisions of the scripts |
272 |
-IM_REV="-r2" |
273 |
-INIT_REV="-r1" |
274 |
- |
275 |
-src_compile() { |
276 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
277 |
- java-pkg-2_src_compile |
278 |
-} |
279 |
- |
280 |
-src_test() { |
281 |
- java-pkg-2_src_test |
282 |
-} |
283 |
- |
284 |
-src_install() { |
285 |
- local dest="/usr/share/${PN}-${SLOT}" |
286 |
- |
287 |
- java-pkg_jarinto "${dest}"/bin |
288 |
- java-pkg_dojar output/build/bin/*.jar |
289 |
- exeinto "${dest}"/bin |
290 |
- doexe output/build/bin/*.sh |
291 |
- |
292 |
- java-pkg_jarinto "${dest}"/lib |
293 |
- java-pkg_dojar output/build/lib/*.jar |
294 |
- |
295 |
- dodoc RELEASE-NOTES RUNNING.txt |
296 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
297 |
- use source && java-pkg_dosrc java/* |
298 |
- |
299 |
- ### Webapps ### |
300 |
- |
301 |
- # add missing docBase |
302 |
- local apps="host-manager manager" |
303 |
- for app in ${apps}; do |
304 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
305 |
- output/build/webapps/${app}/META-INF/context.xml || die |
306 |
- done |
307 |
- |
308 |
- insinto "${dest}"/webapps |
309 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
310 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
311 |
- |
312 |
- ### Config ### |
313 |
- |
314 |
- # create "logs" directory in $CATALINA_BASE |
315 |
- # and set correct perms, see #458890 |
316 |
- dodir "${dest}"/logs |
317 |
- fperms 0750 "${dest}"/logs |
318 |
- |
319 |
- # replace the default pw with a random one, see #92281 |
320 |
- local randpw="$(pwgen -s -B 15 1)" |
321 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
322 |
- |
323 |
- # prepend gentoo.classpath to common.loader, see #453212 |
324 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
325 |
- |
326 |
- insinto "${dest}" |
327 |
- doins -r output/build/conf |
328 |
- |
329 |
- ### rc ### |
330 |
- |
331 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
332 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
333 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
334 |
- |
335 |
- insinto "${dest}"/gentoo |
336 |
- doins "${T}"/tomcat.conf |
337 |
- exeinto "${dest}"/gentoo |
338 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
339 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
340 |
-} |
341 |
- |
342 |
-pkg_postinst() { |
343 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
344 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
345 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
346 |
- |
347 |
- elog "To manage Tomcat instances, run:" |
348 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
349 |
- |
350 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
351 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
352 |
- |
353 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
354 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
355 |
-} |
356 |
|
357 |
diff --git a/www-servers/tomcat/tomcat-9.0.21.ebuild b/www-servers/tomcat/tomcat-9.0.21.ebuild |
358 |
deleted file mode 100644 |
359 |
index 653707b85ff..00000000000 |
360 |
--- a/www-servers/tomcat/tomcat-9.0.21.ebuild |
361 |
+++ /dev/null |
362 |
@@ -1,182 +0,0 @@ |
363 |
-# Copyright 1999-2019 Gentoo Authors |
364 |
-# Distributed under the terms of the GNU General Public License v2 |
365 |
- |
366 |
-EAPI=6 |
367 |
- |
368 |
-JAVA_PKG_IUSE="doc source test" |
369 |
- |
370 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
371 |
- |
372 |
-MY_P="apache-${PN}-${PV}-src" |
373 |
- |
374 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
375 |
-# See bugs #203080 and #676116 |
376 |
-BND_VERSION="4.1.0" |
377 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
378 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
379 |
- |
380 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" |
381 |
-HOMEPAGE="https://tomcat.apache.org/" |
382 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
383 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
384 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
385 |
- |
386 |
-LICENSE="Apache-2.0" |
387 |
-SLOT="9" |
388 |
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
389 |
-IUSE="extra-webapps" |
390 |
- |
391 |
-RESTRICT="test" # can we run them on a production system? |
392 |
- |
393 |
-ECJ_SLOT="4.10" |
394 |
-SAPI_SLOT="4.0" |
395 |
- |
396 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
397 |
- dev-java/glassfish-xmlrpc-api:0 |
398 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT} |
399 |
- dev-java/wsdl4j:0" |
400 |
-RDEPEND="${COMMON_DEP} |
401 |
- !<dev-java/tomcat-native-1.1.24 |
402 |
- >=virtual/jre-11" |
403 |
-DEPEND="${COMMON_DEP} |
404 |
- app-admin/pwgen |
405 |
- >=dev-java/ant-core-1.9.13 |
406 |
- >=virtual/jdk-11 |
407 |
- test? ( |
408 |
- >=dev-java/ant-junit-1.9:0 |
409 |
- dev-java/easymock:3.2 |
410 |
- )" |
411 |
- |
412 |
-S=${WORKDIR}/${MY_P} |
413 |
- |
414 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
415 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
416 |
-BND_JAR="${BND_HOME}/${BND}" |
417 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
418 |
- |
419 |
-src_unpack() { |
420 |
- unpack ${MY_P}.tar.gz |
421 |
- |
422 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
423 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
424 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
425 |
-} |
426 |
- |
427 |
-pkg_setup() { |
428 |
- java-pkg-2_pkg_setup |
429 |
- enewgroup tomcat 265 |
430 |
- enewuser tomcat 265 -1 /dev/null tomcat |
431 |
-} |
432 |
- |
433 |
-src_prepare() { |
434 |
- default |
435 |
- |
436 |
- find -name '*.jar' -type f -delete -print || die |
437 |
- |
438 |
- # Remove bundled servlet-api |
439 |
- rm -rv java/javax/{el,servlet} || die |
440 |
- |
441 |
- eapply "${FILESDIR}/${PN}-9.0.19-build.xml.patch" |
442 |
- |
443 |
- # For use of catalina.sh in netbeans |
444 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
445 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
446 |
- bin/catalina.sh || die |
447 |
- |
448 |
- java-pkg-2_src_prepare |
449 |
-} |
450 |
- |
451 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
452 |
- |
453 |
-EANT_BUILD_TARGET="deploy" |
454 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j" |
455 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
456 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
457 |
-EANT_NEEDS_TOOLS="true" |
458 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
459 |
- |
460 |
-# revisions of the scripts |
461 |
-IM_REV="-r2" |
462 |
-INIT_REV="-r1" |
463 |
- |
464 |
-src_compile() { |
465 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
466 |
- java-pkg-2_src_compile |
467 |
-} |
468 |
- |
469 |
-src_test() { |
470 |
- java-pkg-2_src_test |
471 |
-} |
472 |
- |
473 |
-src_install() { |
474 |
- local dest="/usr/share/${PN}-${SLOT}" |
475 |
- |
476 |
- java-pkg_jarinto "${dest}"/bin |
477 |
- java-pkg_dojar output/build/bin/*.jar |
478 |
- exeinto "${dest}"/bin |
479 |
- doexe output/build/bin/*.sh |
480 |
- |
481 |
- java-pkg_jarinto "${dest}"/lib |
482 |
- java-pkg_dojar output/build/lib/*.jar |
483 |
- |
484 |
- dodoc RELEASE-NOTES RUNNING.txt |
485 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
486 |
- use source && java-pkg_dosrc java/* |
487 |
- |
488 |
- ### Webapps ### |
489 |
- |
490 |
- # add missing docBase |
491 |
- local apps="host-manager manager" |
492 |
- for app in ${apps}; do |
493 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
494 |
- output/build/webapps/${app}/META-INF/context.xml || die |
495 |
- done |
496 |
- |
497 |
- insinto "${dest}"/webapps |
498 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
499 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
500 |
- |
501 |
- ### Config ### |
502 |
- |
503 |
- # create "logs" directory in $CATALINA_BASE |
504 |
- # and set correct perms, see #458890 |
505 |
- dodir "${dest}"/logs |
506 |
- fperms 0750 "${dest}"/logs |
507 |
- |
508 |
- # replace the default pw with a random one, see #92281 |
509 |
- local randpw="$(pwgen -s -B 15 1)" |
510 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
511 |
- |
512 |
- # prepend gentoo.classpath to common.loader, see #453212 |
513 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
514 |
- |
515 |
- insinto "${dest}" |
516 |
- doins -r output/build/conf |
517 |
- |
518 |
- ### rc ### |
519 |
- |
520 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
521 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
522 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
523 |
- |
524 |
- insinto "${dest}"/gentoo |
525 |
- doins "${T}"/tomcat.conf |
526 |
- exeinto "${dest}"/gentoo |
527 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
528 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
529 |
-} |
530 |
- |
531 |
-pkg_postinst() { |
532 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
533 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
534 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
535 |
- |
536 |
- elog "To manage Tomcat instances, run:" |
537 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
538 |
- |
539 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
540 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
541 |
- |
542 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
543 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
544 |
-} |
545 |
|
546 |
diff --git a/www-servers/tomcat/tomcat-9.0.22.ebuild b/www-servers/tomcat/tomcat-9.0.22.ebuild |
547 |
deleted file mode 100644 |
548 |
index 653707b85ff..00000000000 |
549 |
--- a/www-servers/tomcat/tomcat-9.0.22.ebuild |
550 |
+++ /dev/null |
551 |
@@ -1,182 +0,0 @@ |
552 |
-# Copyright 1999-2019 Gentoo Authors |
553 |
-# Distributed under the terms of the GNU General Public License v2 |
554 |
- |
555 |
-EAPI=6 |
556 |
- |
557 |
-JAVA_PKG_IUSE="doc source test" |
558 |
- |
559 |
-inherit eutils java-pkg-2 java-ant-2 prefix user |
560 |
- |
561 |
-MY_P="apache-${PN}-${PV}-src" |
562 |
- |
563 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
564 |
-# See bugs #203080 and #676116 |
565 |
-BND_VERSION="4.1.0" |
566 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
567 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
568 |
- |
569 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" |
570 |
-HOMEPAGE="https://tomcat.apache.org/" |
571 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
572 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
573 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
574 |
- |
575 |
-LICENSE="Apache-2.0" |
576 |
-SLOT="9" |
577 |
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
578 |
-IUSE="extra-webapps" |
579 |
- |
580 |
-RESTRICT="test" # can we run them on a production system? |
581 |
- |
582 |
-ECJ_SLOT="4.10" |
583 |
-SAPI_SLOT="4.0" |
584 |
- |
585 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
586 |
- dev-java/glassfish-xmlrpc-api:0 |
587 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT} |
588 |
- dev-java/wsdl4j:0" |
589 |
-RDEPEND="${COMMON_DEP} |
590 |
- !<dev-java/tomcat-native-1.1.24 |
591 |
- >=virtual/jre-11" |
592 |
-DEPEND="${COMMON_DEP} |
593 |
- app-admin/pwgen |
594 |
- >=dev-java/ant-core-1.9.13 |
595 |
- >=virtual/jdk-11 |
596 |
- test? ( |
597 |
- >=dev-java/ant-junit-1.9:0 |
598 |
- dev-java/easymock:3.2 |
599 |
- )" |
600 |
- |
601 |
-S=${WORKDIR}/${MY_P} |
602 |
- |
603 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
604 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
605 |
-BND_JAR="${BND_HOME}/${BND}" |
606 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
607 |
- |
608 |
-src_unpack() { |
609 |
- unpack ${MY_P}.tar.gz |
610 |
- |
611 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
612 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
613 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
614 |
-} |
615 |
- |
616 |
-pkg_setup() { |
617 |
- java-pkg-2_pkg_setup |
618 |
- enewgroup tomcat 265 |
619 |
- enewuser tomcat 265 -1 /dev/null tomcat |
620 |
-} |
621 |
- |
622 |
-src_prepare() { |
623 |
- default |
624 |
- |
625 |
- find -name '*.jar' -type f -delete -print || die |
626 |
- |
627 |
- # Remove bundled servlet-api |
628 |
- rm -rv java/javax/{el,servlet} || die |
629 |
- |
630 |
- eapply "${FILESDIR}/${PN}-9.0.19-build.xml.patch" |
631 |
- |
632 |
- # For use of catalina.sh in netbeans |
633 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
634 |
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
635 |
- bin/catalina.sh || die |
636 |
- |
637 |
- java-pkg-2_src_prepare |
638 |
-} |
639 |
- |
640 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
641 |
- |
642 |
-EANT_BUILD_TARGET="deploy" |
643 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j" |
644 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
645 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
646 |
-EANT_NEEDS_TOOLS="true" |
647 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
648 |
- |
649 |
-# revisions of the scripts |
650 |
-IM_REV="-r2" |
651 |
-INIT_REV="-r1" |
652 |
- |
653 |
-src_compile() { |
654 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
655 |
- java-pkg-2_src_compile |
656 |
-} |
657 |
- |
658 |
-src_test() { |
659 |
- java-pkg-2_src_test |
660 |
-} |
661 |
- |
662 |
-src_install() { |
663 |
- local dest="/usr/share/${PN}-${SLOT}" |
664 |
- |
665 |
- java-pkg_jarinto "${dest}"/bin |
666 |
- java-pkg_dojar output/build/bin/*.jar |
667 |
- exeinto "${dest}"/bin |
668 |
- doexe output/build/bin/*.sh |
669 |
- |
670 |
- java-pkg_jarinto "${dest}"/lib |
671 |
- java-pkg_dojar output/build/lib/*.jar |
672 |
- |
673 |
- dodoc RELEASE-NOTES RUNNING.txt |
674 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
675 |
- use source && java-pkg_dosrc java/* |
676 |
- |
677 |
- ### Webapps ### |
678 |
- |
679 |
- # add missing docBase |
680 |
- local apps="host-manager manager" |
681 |
- for app in ${apps}; do |
682 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
683 |
- output/build/webapps/${app}/META-INF/context.xml || die |
684 |
- done |
685 |
- |
686 |
- insinto "${dest}"/webapps |
687 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
688 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
689 |
- |
690 |
- ### Config ### |
691 |
- |
692 |
- # create "logs" directory in $CATALINA_BASE |
693 |
- # and set correct perms, see #458890 |
694 |
- dodir "${dest}"/logs |
695 |
- fperms 0750 "${dest}"/logs |
696 |
- |
697 |
- # replace the default pw with a random one, see #92281 |
698 |
- local randpw="$(pwgen -s -B 15 1)" |
699 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
700 |
- |
701 |
- # prepend gentoo.classpath to common.loader, see #453212 |
702 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
703 |
- |
704 |
- insinto "${dest}" |
705 |
- doins -r output/build/conf |
706 |
- |
707 |
- ### rc ### |
708 |
- |
709 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
710 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
711 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
712 |
- |
713 |
- insinto "${dest}"/gentoo |
714 |
- doins "${T}"/tomcat.conf |
715 |
- exeinto "${dest}"/gentoo |
716 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
717 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
718 |
-} |
719 |
- |
720 |
-pkg_postinst() { |
721 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
722 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
723 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
724 |
- |
725 |
- elog "To manage Tomcat instances, run:" |
726 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
727 |
- |
728 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
729 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
730 |
- |
731 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
732 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
733 |
-} |