1 |
commit: cfb943654f4a6265857dd6c9ea645062945b31fb |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 1 06:56:15 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 1 06:57:30 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb94365 |
7 |
|
8 |
www-servers/tomcat: removed obsolete 7.0.108 |
9 |
|
10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
www-servers/tomcat/Manifest | 1 - |
14 |
www-servers/tomcat/tomcat-7.0.108.ebuild | 142 ------------------------------- |
15 |
2 files changed, 143 deletions(-) |
16 |
|
17 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
18 |
index ffb6fc1e365..f982863a11b 100644 |
19 |
--- a/www-servers/tomcat/Manifest |
20 |
+++ b/www-servers/tomcat/Manifest |
21 |
@@ -1,6 +1,5 @@ |
22 |
DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f |
23 |
DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100 |
24 |
-DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2 |
25 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
26 |
DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa |
27 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
28 |
|
29 |
diff --git a/www-servers/tomcat/tomcat-7.0.108.ebuild b/www-servers/tomcat/tomcat-7.0.108.ebuild |
30 |
deleted file mode 100644 |
31 |
index 62b762d4f8e..00000000000 |
32 |
--- a/www-servers/tomcat/tomcat-7.0.108.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,142 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-JAVA_PKG_IUSE="doc source test" |
41 |
- |
42 |
-inherit java-pkg-2 java-ant-2 prefix |
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-${PV}:${SAPI_SLOT}" |
62 |
-RDEPEND="${COMMON_DEP} |
63 |
- acct-group/tomcat |
64 |
- acct-user/tomcat |
65 |
- virtual/jre" |
66 |
-DEPEND="${COMMON_DEP} |
67 |
- virtual/jdk:1.8 |
68 |
- test? ( dev-java/ant-junit:0 )" |
69 |
- |
70 |
-S=${WORKDIR}/${MY_P} |
71 |
- |
72 |
-src_prepare() { |
73 |
- default |
74 |
- |
75 |
- # Remove bundled servlet-api |
76 |
- rm -rv java/javax/{el,servlet} || die |
77 |
- |
78 |
- java-pkg_clean |
79 |
- |
80 |
- eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch" |
81 |
- |
82 |
- # For use of catalina.sh in netbeans |
83 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
84 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
85 |
- bin/catalina.sh || die |
86 |
- |
87 |
- java-pkg-2_src_prepare |
88 |
-} |
89 |
- |
90 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
91 |
- |
92 |
-EANT_BUILD_TARGET="deploy" |
93 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
94 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
95 |
-EANT_NEEDS_TOOLS="true" |
96 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
97 |
- |
98 |
-# revisions of the scripts |
99 |
-IM_REV="-r1" |
100 |
-INIT_REV="-r1" |
101 |
- |
102 |
-src_compile() { |
103 |
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" |
104 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
105 |
- java-pkg-2_src_compile |
106 |
-} |
107 |
- |
108 |
-src_test() { |
109 |
- java-pkg-2_src_test |
110 |
-} |
111 |
- |
112 |
-src_install() { |
113 |
- local dest="/usr/share/${PN}-${SLOT}" |
114 |
- |
115 |
- java-pkg_jarinto "${dest}"/bin |
116 |
- java-pkg_dojar output/build/bin/*.jar |
117 |
- exeinto "${dest}"/bin |
118 |
- doexe output/build/bin/*.sh |
119 |
- |
120 |
- java-pkg_jarinto "${dest}"/lib |
121 |
- java-pkg_dojar output/build/lib/*.jar |
122 |
- |
123 |
- dodoc RELEASE-NOTES RUNNING.txt |
124 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
125 |
- use source && java-pkg_dosrc java/* |
126 |
- |
127 |
- ### Webapps ### |
128 |
- |
129 |
- insinto "${dest}"/webapps |
130 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
131 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
132 |
- |
133 |
- ### Config ### |
134 |
- |
135 |
- # create "logs" directory in $CATALINA_BASE |
136 |
- # and set correct perms, see #458890 |
137 |
- dodir "${dest}"/logs |
138 |
- fperms 0750 "${dest}"/logs |
139 |
- |
140 |
- # replace the default pw with a random one, see #92281 |
141 |
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) |
142 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
143 |
- |
144 |
- # prepend gentoo.classpath to common.loader, see #453212 |
145 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
146 |
- |
147 |
- insinto "${dest}" |
148 |
- doins -r output/build/conf |
149 |
- |
150 |
- ### rc ### |
151 |
- |
152 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
153 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
154 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
155 |
- |
156 |
- insinto "${dest}"/gentoo |
157 |
- doins "${T}"/tomcat.conf |
158 |
- exeinto "${dest}"/gentoo |
159 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
160 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
161 |
-} |
162 |
- |
163 |
-pkg_postinst() { |
164 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
165 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
166 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
167 |
- |
168 |
- elog "To manage Tomcat instances, run:" |
169 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
170 |
- |
171 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
172 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
173 |
- |
174 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
175 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
176 |
-} |