1 |
commit: 57b3824d2b8ad037af5659614f46d470013d2927 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 4 05:30:31 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 4 05:30:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b3824d |
7 |
|
8 |
www-servers/tomcat: removed obsolete 8.5.75, 9.0.58 & 10.0.16 |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
www-servers/tomcat/Manifest | 5 - |
13 |
www-servers/tomcat/tomcat-10.0.16.ebuild | 195 ------------------------------- |
14 |
www-servers/tomcat/tomcat-8.5.75.ebuild | 159 ------------------------- |
15 |
www-servers/tomcat/tomcat-9.0.58.ebuild | 187 ----------------------------- |
16 |
4 files changed, 546 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
19 |
index b96dcd3d82c4..523db26db27c 100644 |
20 |
--- a/www-servers/tomcat/Manifest |
21 |
+++ b/www-servers/tomcat/Manifest |
22 |
@@ -1,17 +1,12 @@ |
23 |
-DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8 |
24 |
DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d |
25 |
DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab |
26 |
DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f |
27 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
28 |
-DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad |
29 |
DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9 |
30 |
DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157 |
31 |
DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32 |
32 |
-DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a |
33 |
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 |
34 |
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 |
35 |
DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 |
36 |
-DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 |
37 |
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f |
38 |
-DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b |
39 |
DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a |
40 |
|
41 |
diff --git a/www-servers/tomcat/tomcat-10.0.16.ebuild b/www-servers/tomcat/tomcat-10.0.16.ebuild |
42 |
deleted file mode 100644 |
43 |
index 7bcc165f4942..000000000000 |
44 |
--- a/www-servers/tomcat/tomcat-10.0.16.ebuild |
45 |
+++ /dev/null |
46 |
@@ -1,195 +0,0 @@ |
47 |
-# Copyright 1999-2022 Gentoo Authors |
48 |
-# Distributed under the terms of the GNU General Public License v2 |
49 |
- |
50 |
-EAPI=8 |
51 |
- |
52 |
-JAVA_PKG_IUSE="doc source test" |
53 |
- |
54 |
-inherit java-pkg-2 java-ant-2 prefix |
55 |
- |
56 |
-MY_P="apache-${PN}-${PV}-src" |
57 |
- |
58 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
59 |
-# See bugs #203080 and #676116 |
60 |
-BND_VERSION="5.1.1" |
61 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
62 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
63 |
- |
64 |
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
65 |
-HOMEPAGE="https://tomcat.apache.org/" |
66 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
67 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
68 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
69 |
- |
70 |
-LICENSE="Apache-2.0" |
71 |
-SLOT="10" |
72 |
-KEYWORDS="amd64 ~amd64-linux" |
73 |
-IUSE="extra-webapps" |
74 |
- |
75 |
-RESTRICT="test" # can we run them on a production system? |
76 |
- |
77 |
-ECJ_SLOT="4.15" |
78 |
-SAPI_SLOT="5.0" |
79 |
- |
80 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
81 |
- dev-java/glassfish-xmlrpc-api:0 |
82 |
- dev-java/jakartaee-migration:0 |
83 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
84 |
- dev-java/wsdl4j:0" |
85 |
-RDEPEND="${COMMON_DEP} |
86 |
- acct-group/tomcat |
87 |
- acct-user/tomcat |
88 |
- virtual/jre" |
89 |
-DEPEND="${COMMON_DEP} |
90 |
- app-admin/pwgen |
91 |
- dev-java/ant-core |
92 |
- virtual/jdk:1.8 |
93 |
- test? ( |
94 |
- dev-java/ant-junit:0 |
95 |
- dev-java/easymock:3.2 |
96 |
- )" |
97 |
- |
98 |
-S=${WORKDIR}/${MY_P} |
99 |
- |
100 |
-PATCHES=( |
101 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
102 |
-) |
103 |
- |
104 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
105 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
106 |
-BND_JAR="${BND_HOME}/${BND}" |
107 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
108 |
- |
109 |
-src_unpack() { |
110 |
- unpack ${MY_P}.tar.gz |
111 |
- |
112 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
113 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
114 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
115 |
-} |
116 |
- |
117 |
-src_prepare() { |
118 |
- default |
119 |
- |
120 |
- find -name '*.jar' -type f -delete -print || die |
121 |
- |
122 |
- # Remove bundled servlet-api |
123 |
- rm -rv java/jakarta/{el,servlet} || die |
124 |
- |
125 |
- eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch" |
126 |
- |
127 |
- local vm_version="$(java-config -g PROVIDES_VERSION)" |
128 |
- [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" |
129 |
- |
130 |
- # For use of catalina.sh in netbeans |
131 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
132 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
133 |
- bin/catalina.sh || die |
134 |
- |
135 |
- java-pkg-2_src_prepare |
136 |
-} |
137 |
- |
138 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
139 |
- |
140 |
-EANT_BUILD_TARGET="deploy" |
141 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
142 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
143 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
144 |
-EANT_NEEDS_TOOLS="true" |
145 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
146 |
- |
147 |
-# revisions of the scripts |
148 |
-IM_REV="-r2" |
149 |
-INIT_REV="-r1" |
150 |
- |
151 |
-src_configure() { |
152 |
- java-ant-2_src_configure |
153 |
- |
154 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
155 |
-} |
156 |
- |
157 |
-src_compile() { |
158 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
159 |
- LC_ALL=C java-pkg-2_src_compile |
160 |
-} |
161 |
- |
162 |
-src_test() { |
163 |
- java-pkg-2_src_test |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- local dest="/usr/share/${PN}-${SLOT}" |
168 |
- |
169 |
- java-pkg_jarinto "${dest}"/bin |
170 |
- java-pkg_dojar output/build/bin/*.jar |
171 |
- exeinto "${dest}"/bin |
172 |
- doexe output/build/bin/*.sh |
173 |
- |
174 |
- java-pkg_jarinto "${dest}"/lib |
175 |
- java-pkg_dojar output/build/lib/*.jar |
176 |
- |
177 |
- dodoc RELEASE-NOTES RUNNING.txt |
178 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
179 |
- use source && java-pkg_dosrc java/* |
180 |
- |
181 |
- ### Webapps ### |
182 |
- |
183 |
- # add missing docBase |
184 |
- local apps="host-manager manager" |
185 |
- for app in ${apps}; do |
186 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
187 |
- output/build/webapps/${app}/META-INF/context.xml || die |
188 |
- done |
189 |
- |
190 |
- insinto "${dest}"/webapps |
191 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
192 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
193 |
- |
194 |
- ### Config ### |
195 |
- |
196 |
- # create "logs" directory in $CATALINA_BASE |
197 |
- # and set correct perms, see #458890 |
198 |
- dodir "${dest}"/logs |
199 |
- fperms 0750 "${dest}"/logs |
200 |
- |
201 |
- # replace the default pw with a random one, see #92281 |
202 |
- local randpw="$(pwgen -s -B 15 1)" |
203 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
204 |
- |
205 |
- # prepend gentoo.classpath to common.loader, see #453212 |
206 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
207 |
- |
208 |
- insinto "${dest}" |
209 |
- doins -r output/build/conf |
210 |
- |
211 |
- ### rc ### |
212 |
- |
213 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
214 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
215 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
216 |
- |
217 |
- insinto "${dest}"/gentoo |
218 |
- doins "${T}"/tomcat.conf |
219 |
- exeinto "${dest}"/gentoo |
220 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
221 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
222 |
-} |
223 |
- |
224 |
-pkg_postinst() { |
225 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
226 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
227 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
228 |
- |
229 |
- elog "To manage Tomcat instances, run:" |
230 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
231 |
- |
232 |
- ewarn "Please note that since version 10 the primary package for all implemented APIs" |
233 |
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
234 |
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
235 |
- |
236 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
237 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
238 |
- |
239 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
240 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
241 |
-} |
242 |
|
243 |
diff --git a/www-servers/tomcat/tomcat-8.5.75.ebuild b/www-servers/tomcat/tomcat-8.5.75.ebuild |
244 |
deleted file mode 100644 |
245 |
index 5a0d89721993..000000000000 |
246 |
--- a/www-servers/tomcat/tomcat-8.5.75.ebuild |
247 |
+++ /dev/null |
248 |
@@ -1,159 +0,0 @@ |
249 |
-# Copyright 1999-2022 Gentoo Authors |
250 |
-# Distributed under the terms of the GNU General Public License v2 |
251 |
- |
252 |
-EAPI=8 |
253 |
- |
254 |
-JAVA_PKG_IUSE="doc source test" |
255 |
- |
256 |
-inherit java-pkg-2 java-ant-2 prefix |
257 |
- |
258 |
-MY_P="apache-${P}-src" |
259 |
- |
260 |
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
261 |
-HOMEPAGE="https://tomcat.apache.org/" |
262 |
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
263 |
- |
264 |
-LICENSE="Apache-2.0" |
265 |
-SLOT="8.5" |
266 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
267 |
-IUSE="extra-webapps" |
268 |
- |
269 |
-RESTRICT="test" # can we run them on a production system? |
270 |
- |
271 |
-ECJ_SLOT="4.5" |
272 |
-SAPI_SLOT="3.1" |
273 |
- |
274 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
275 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
276 |
-RDEPEND="${COMMON_DEP} |
277 |
- acct-group/tomcat |
278 |
- acct-user/tomcat |
279 |
- virtual/jre" |
280 |
-DEPEND="${COMMON_DEP} |
281 |
- app-admin/pwgen |
282 |
- dev-java/ant-core |
283 |
- virtual/jdk:1.8 |
284 |
- doc? ( |
285 |
- dev-java/glassfish-xmlrpc-api:0 |
286 |
- dev-java/wsdl4j:0 |
287 |
- ) |
288 |
- test? ( |
289 |
- >=dev-java/ant-junit-1.9:0 |
290 |
- dev-java/easymock:3.2 |
291 |
- )" |
292 |
- |
293 |
-S=${WORKDIR}/${MY_P} |
294 |
- |
295 |
-src_prepare() { |
296 |
- default |
297 |
- |
298 |
- find -name '*.jar' -type f -delete -print || die |
299 |
- |
300 |
- # Remove bundled servlet-api |
301 |
- rm -rv java/javax/{el,servlet} || die |
302 |
- |
303 |
- eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch" |
304 |
- |
305 |
- # For use of catalina.sh in netbeans |
306 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
307 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
308 |
- bin/catalina.sh || die |
309 |
- |
310 |
- java-pkg-2_src_prepare |
311 |
-} |
312 |
- |
313 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
314 |
- |
315 |
-EANT_BUILD_TARGET="deploy" |
316 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
317 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
318 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
319 |
-EANT_NEEDS_TOOLS="true" |
320 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
321 |
- |
322 |
-# revisions of the scripts |
323 |
-IM_REV="-r2" |
324 |
-INIT_REV="-r1" |
325 |
- |
326 |
-src_compile() { |
327 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
328 |
- use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)" |
329 |
- LC_ALL=C java-pkg-2_src_compile |
330 |
-} |
331 |
- |
332 |
-src_test() { |
333 |
- java-pkg-2_src_test |
334 |
-} |
335 |
- |
336 |
-src_install() { |
337 |
- local dest="/usr/share/${PN}-${SLOT}" |
338 |
- |
339 |
- java-pkg_jarinto "${dest}"/bin |
340 |
- java-pkg_dojar output/build/bin/*.jar |
341 |
- exeinto "${dest}"/bin |
342 |
- doexe output/build/bin/*.sh |
343 |
- |
344 |
- java-pkg_jarinto "${dest}"/lib |
345 |
- java-pkg_dojar output/build/lib/*.jar |
346 |
- |
347 |
- dodoc RELEASE-NOTES RUNNING.txt |
348 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
349 |
- use source && java-pkg_dosrc java/* |
350 |
- |
351 |
- ### Webapps ### |
352 |
- |
353 |
- # add missing docBase |
354 |
- local apps="host-manager manager" |
355 |
- for app in ${apps}; do |
356 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
357 |
- output/build/webapps/${app}/META-INF/context.xml || die |
358 |
- done |
359 |
- |
360 |
- insinto "${dest}"/webapps |
361 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
362 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
363 |
- |
364 |
- ### Config ### |
365 |
- |
366 |
- # create "logs" directory in $CATALINA_BASE |
367 |
- # and set correct perms, see #458890 |
368 |
- dodir "${dest}"/logs |
369 |
- fperms 0750 "${dest}"/logs |
370 |
- |
371 |
- # replace the default pw with a random one, see #92281 |
372 |
- local randpw="$(pwgen -s -B 15 1)" |
373 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
374 |
- |
375 |
- # prepend gentoo.classpath to common.loader, see #453212 |
376 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
377 |
- |
378 |
- insinto "${dest}" |
379 |
- doins -r output/build/conf |
380 |
- |
381 |
- ### rc ### |
382 |
- |
383 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
384 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
385 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
386 |
- |
387 |
- insinto "${dest}"/gentoo |
388 |
- doins "${T}"/tomcat.conf |
389 |
- exeinto "${dest}"/gentoo |
390 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
391 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
392 |
-} |
393 |
- |
394 |
-pkg_postinst() { |
395 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
396 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
397 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
398 |
- |
399 |
- elog "To manage Tomcat instances, run:" |
400 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
401 |
- |
402 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
403 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
404 |
- |
405 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
406 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
407 |
-} |
408 |
|
409 |
diff --git a/www-servers/tomcat/tomcat-9.0.58.ebuild b/www-servers/tomcat/tomcat-9.0.58.ebuild |
410 |
deleted file mode 100644 |
411 |
index bbea8f6df4eb..000000000000 |
412 |
--- a/www-servers/tomcat/tomcat-9.0.58.ebuild |
413 |
+++ /dev/null |
414 |
@@ -1,187 +0,0 @@ |
415 |
-# Copyright 1999-2022 Gentoo Authors |
416 |
-# Distributed under the terms of the GNU General Public License v2 |
417 |
- |
418 |
-EAPI=8 |
419 |
- |
420 |
-JAVA_PKG_IUSE="doc source test" |
421 |
- |
422 |
-inherit java-pkg-2 java-ant-2 prefix |
423 |
- |
424 |
-MY_P="apache-${PN}-${PV}-src" |
425 |
- |
426 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
427 |
-# See bugs #203080 and #676116 |
428 |
-BND_VERSION="5.1.1" |
429 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
430 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
431 |
- |
432 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
433 |
-HOMEPAGE="https://tomcat.apache.org/" |
434 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
435 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
436 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
437 |
- |
438 |
-LICENSE="Apache-2.0" |
439 |
-SLOT="9" |
440 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
441 |
-IUSE="extra-webapps" |
442 |
- |
443 |
-RESTRICT="test" # can we run them on a production system? |
444 |
- |
445 |
-ECJ_SLOT="4.15" |
446 |
-SAPI_SLOT="4.0" |
447 |
- |
448 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
449 |
- dev-java/glassfish-xmlrpc-api:0 |
450 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
451 |
- dev-java/wsdl4j:0" |
452 |
-RDEPEND="${COMMON_DEP} |
453 |
- acct-group/tomcat |
454 |
- acct-user/tomcat |
455 |
- virtual/jre" |
456 |
-DEPEND="${COMMON_DEP} |
457 |
- app-admin/pwgen |
458 |
- >=dev-java/ant-core-1.9.13 |
459 |
- virtual/jdk:1.8 |
460 |
- test? ( |
461 |
- >=dev-java/ant-junit-1.9:0 |
462 |
- dev-java/easymock:3.2 |
463 |
- )" |
464 |
- |
465 |
-S=${WORKDIR}/${MY_P} |
466 |
- |
467 |
-PATCHES=( |
468 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
469 |
-) |
470 |
- |
471 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
472 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
473 |
-BND_JAR="${BND_HOME}/${BND}" |
474 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
475 |
- |
476 |
-src_unpack() { |
477 |
- unpack ${MY_P}.tar.gz |
478 |
- |
479 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
480 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
481 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
482 |
-} |
483 |
- |
484 |
-src_prepare() { |
485 |
- default |
486 |
- |
487 |
- find -name '*.jar' -type f -delete -print || die |
488 |
- |
489 |
- # Remove bundled servlet-api |
490 |
- rm -rv java/javax/{el,servlet} || die |
491 |
- |
492 |
- eapply "${FILESDIR}/${PN}-9.0.58-build.xml.patch" |
493 |
- |
494 |
- # For use of catalina.sh in netbeans |
495 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
496 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
497 |
- bin/catalina.sh || die |
498 |
- |
499 |
- java-pkg-2_src_prepare |
500 |
-} |
501 |
- |
502 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
503 |
- |
504 |
-EANT_BUILD_TARGET="deploy" |
505 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
506 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
507 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
508 |
-EANT_NEEDS_TOOLS="true" |
509 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
510 |
- |
511 |
-# revisions of the scripts |
512 |
-IM_REV="-r2" |
513 |
-INIT_REV="-r1" |
514 |
- |
515 |
-src_configure() { |
516 |
- java-ant-2_src_configure |
517 |
- |
518 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
519 |
-} |
520 |
- |
521 |
-src_compile() { |
522 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
523 |
- LC_ALL=C java-pkg-2_src_compile |
524 |
-} |
525 |
- |
526 |
-src_test() { |
527 |
- java-pkg-2_src_test |
528 |
-} |
529 |
- |
530 |
-src_install() { |
531 |
- local dest="/usr/share/${PN}-${SLOT}" |
532 |
- |
533 |
- java-pkg_jarinto "${dest}"/bin |
534 |
- java-pkg_dojar output/build/bin/*.jar |
535 |
- exeinto "${dest}"/bin |
536 |
- doexe output/build/bin/*.sh |
537 |
- |
538 |
- java-pkg_jarinto "${dest}"/lib |
539 |
- java-pkg_dojar output/build/lib/*.jar |
540 |
- |
541 |
- dodoc RELEASE-NOTES RUNNING.txt |
542 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
543 |
- use source && java-pkg_dosrc java/* |
544 |
- |
545 |
- ### Webapps ### |
546 |
- |
547 |
- # add missing docBase |
548 |
- local apps="host-manager manager" |
549 |
- for app in ${apps}; do |
550 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
551 |
- output/build/webapps/${app}/META-INF/context.xml || die |
552 |
- done |
553 |
- |
554 |
- insinto "${dest}"/webapps |
555 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
556 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
557 |
- |
558 |
- ### Config ### |
559 |
- |
560 |
- # create "logs" directory in $CATALINA_BASE |
561 |
- # and set correct perms, see #458890 |
562 |
- dodir "${dest}"/logs |
563 |
- fperms 0750 "${dest}"/logs |
564 |
- |
565 |
- # replace the default pw with a random one, see #92281 |
566 |
- local randpw="$(pwgen -s -B 15 1)" |
567 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
568 |
- |
569 |
- # prepend gentoo.classpath to common.loader, see #453212 |
570 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
571 |
- |
572 |
- insinto "${dest}" |
573 |
- doins -r output/build/conf |
574 |
- |
575 |
- ### rc ### |
576 |
- |
577 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
578 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
579 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
580 |
- |
581 |
- insinto "${dest}"/gentoo |
582 |
- doins "${T}"/tomcat.conf |
583 |
- exeinto "${dest}"/gentoo |
584 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
585 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
586 |
-} |
587 |
- |
588 |
-pkg_postinst() { |
589 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
590 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
591 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
592 |
- |
593 |
- elog "To manage Tomcat instances, run:" |
594 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
595 |
- |
596 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
597 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
598 |
- |
599 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
600 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
601 |
-} |