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