| 1 |
commit: 762ab45ea9b8474a3af58c8020cd87fc925484f5 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 1 05:50:35 2022 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 05:50:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762ab45e |
| 7 |
|
| 8 |
www-servers/tomcat: dropped obsolete 9.0.60 & 10.0.18 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/842051 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/tomcat/Manifest | 2 - |
| 14 |
www-servers/tomcat/tomcat-10.0.18.ebuild | 198 ------------------------------- |
| 15 |
www-servers/tomcat/tomcat-9.0.60.ebuild | 190 ----------------------------- |
| 16 |
3 files changed, 390 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
| 19 |
index 8d7eb59138d7..e72ea2c10571 100644 |
| 20 |
--- a/www-servers/tomcat/Manifest |
| 21 |
+++ b/www-servers/tomcat/Manifest |
| 22 |
@@ -1,11 +1,9 @@ |
| 23 |
-DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab |
| 24 |
DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f |
| 25 |
DIST apache-tomcat-10.0.21-src.tar.gz 6109792 BLAKE2B c650a2e0cb8c6424d98539eaa802c788ff212b014e614123841a806fc9845a953911b5964f67cfc8c1f2ce33dfe627636b5af2f1eaa4b4c985ef4b78d0d831bf SHA512 925bb61ca8b6432e4aef5d5088838e811dbfc0a7b6190354b6ffd957d4ebf145ac1bf4a919b368def0cf63c86c28caf78faf78b190a6e54e085cbf4f108836a1 |
| 26 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
| 27 |
DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157 |
| 28 |
DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32 |
| 29 |
DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff |
| 30 |
-DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 |
| 31 |
DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 |
| 32 |
DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3 |
| 33 |
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f |
| 34 |
|
| 35 |
diff --git a/www-servers/tomcat/tomcat-10.0.18.ebuild b/www-servers/tomcat/tomcat-10.0.18.ebuild |
| 36 |
deleted file mode 100644 |
| 37 |
index 8846292412ce..000000000000 |
| 38 |
--- a/www-servers/tomcat/tomcat-10.0.18.ebuild |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,198 +0,0 @@ |
| 41 |
-# Copyright 1999-2022 Gentoo Authors |
| 42 |
-# Distributed under the terms of the GNU General Public License v2 |
| 43 |
- |
| 44 |
-EAPI=8 |
| 45 |
- |
| 46 |
-JAVA_PKG_IUSE="doc source test" |
| 47 |
- |
| 48 |
-inherit java-pkg-2 java-ant-2 prefix |
| 49 |
- |
| 50 |
-MY_P="apache-${PN}-${PV}-src" |
| 51 |
- |
| 52 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
| 53 |
-# See bugs #203080 and #676116 |
| 54 |
-BND_VERSION="6.2.0" |
| 55 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
| 56 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
| 57 |
- |
| 58 |
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" |
| 59 |
-HOMEPAGE="https://tomcat.apache.org/" |
| 60 |
-SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz |
| 61 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
| 62 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
| 63 |
- |
| 64 |
-LICENSE="Apache-2.0" |
| 65 |
-SLOT="10" |
| 66 |
-KEYWORDS="amd64 ~amd64-linux" |
| 67 |
-IUSE="extra-webapps" |
| 68 |
- |
| 69 |
-RESTRICT="test" # can we run them on a production system? |
| 70 |
- |
| 71 |
-# though it could work with 4.22 and upstream uses 4.20, |
| 72 |
-# we still use 4.15 because 4.20+ is currently built with java 11 |
| 73 |
-# and it would force Tomcat to use at least java 11 too |
| 74 |
-ECJ_SLOT="4.15" |
| 75 |
-SAPI_SLOT="5.0" |
| 76 |
- |
| 77 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 78 |
- dev-java/glassfish-xmlrpc-api:0 |
| 79 |
- dev-java/jakartaee-migration:0 |
| 80 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
| 81 |
- dev-java/wsdl4j:0" |
| 82 |
-RDEPEND="${COMMON_DEP} |
| 83 |
- acct-group/tomcat |
| 84 |
- acct-user/tomcat |
| 85 |
- virtual/jre" |
| 86 |
-DEPEND="${COMMON_DEP} |
| 87 |
- app-admin/pwgen |
| 88 |
- dev-java/ant-core |
| 89 |
- >=virtual/jdk-1.8:* |
| 90 |
- test? ( |
| 91 |
- dev-java/ant-junit:0 |
| 92 |
- dev-java/easymock:3.2 |
| 93 |
- )" |
| 94 |
- |
| 95 |
-S=${WORKDIR}/${MY_P} |
| 96 |
- |
| 97 |
-PATCHES=( |
| 98 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
| 99 |
-) |
| 100 |
- |
| 101 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
| 102 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
| 103 |
-BND_JAR="${BND_HOME}/${BND}" |
| 104 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
| 105 |
- |
| 106 |
-src_unpack() { |
| 107 |
- unpack ${MY_P}.tar.gz |
| 108 |
- |
| 109 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
| 110 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
| 111 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
| 112 |
-} |
| 113 |
- |
| 114 |
-src_prepare() { |
| 115 |
- default |
| 116 |
- |
| 117 |
- find -name '*.jar' -type f -delete -print || die |
| 118 |
- |
| 119 |
- # Remove bundled servlet-api |
| 120 |
- rm -rv java/jakarta/{el,servlet} || die |
| 121 |
- |
| 122 |
- eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch" |
| 123 |
- |
| 124 |
- local vm_version="$(java-config -g PROVIDES_VERSION)" |
| 125 |
- [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" |
| 126 |
- |
| 127 |
- # For use of catalina.sh in netbeans |
| 128 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 129 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
| 130 |
- bin/catalina.sh || die |
| 131 |
- |
| 132 |
- java-pkg-2_src_prepare |
| 133 |
-} |
| 134 |
- |
| 135 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
| 136 |
- |
| 137 |
-EANT_BUILD_TARGET="deploy" |
| 138 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
| 139 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
| 140 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 141 |
-EANT_NEEDS_TOOLS="true" |
| 142 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
| 143 |
- |
| 144 |
-# revisions of the scripts |
| 145 |
-IM_REV="-r2" |
| 146 |
-INIT_REV="-r1" |
| 147 |
- |
| 148 |
-src_configure() { |
| 149 |
- java-ant-2_src_configure |
| 150 |
- |
| 151 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
| 152 |
-} |
| 153 |
- |
| 154 |
-src_compile() { |
| 155 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
| 156 |
- LC_ALL=C java-pkg-2_src_compile |
| 157 |
-} |
| 158 |
- |
| 159 |
-src_test() { |
| 160 |
- java-pkg-2_src_test |
| 161 |
-} |
| 162 |
- |
| 163 |
-src_install() { |
| 164 |
- local dest="/usr/share/${PN}-${SLOT}" |
| 165 |
- |
| 166 |
- java-pkg_jarinto "${dest}"/bin |
| 167 |
- java-pkg_dojar output/build/bin/*.jar |
| 168 |
- exeinto "${dest}"/bin |
| 169 |
- doexe output/build/bin/*.sh |
| 170 |
- |
| 171 |
- java-pkg_jarinto "${dest}"/lib |
| 172 |
- java-pkg_dojar output/build/lib/*.jar |
| 173 |
- |
| 174 |
- dodoc RELEASE-NOTES RUNNING.txt |
| 175 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
| 176 |
- use source && java-pkg_dosrc java/* |
| 177 |
- |
| 178 |
- ### Webapps ### |
| 179 |
- |
| 180 |
- # add missing docBase |
| 181 |
- local apps="host-manager manager" |
| 182 |
- for app in ${apps}; do |
| 183 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
| 184 |
- output/build/webapps/${app}/META-INF/context.xml || die |
| 185 |
- done |
| 186 |
- |
| 187 |
- insinto "${dest}"/webapps |
| 188 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
| 189 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
| 190 |
- |
| 191 |
- ### Config ### |
| 192 |
- |
| 193 |
- # create "logs" directory in $CATALINA_BASE |
| 194 |
- # and set correct perms, see #458890 |
| 195 |
- dodir "${dest}"/logs |
| 196 |
- fperms 0750 "${dest}"/logs |
| 197 |
- |
| 198 |
- # replace the default pw with a random one, see #92281 |
| 199 |
- local randpw="$(pwgen -s -B 15 1)" |
| 200 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
| 201 |
- |
| 202 |
- # prepend gentoo.classpath to common.loader, see #453212 |
| 203 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
| 204 |
- |
| 205 |
- insinto "${dest}" |
| 206 |
- doins -r output/build/conf |
| 207 |
- |
| 208 |
- ### rc ### |
| 209 |
- |
| 210 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
| 211 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
| 212 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
| 213 |
- |
| 214 |
- insinto "${dest}"/gentoo |
| 215 |
- doins "${T}"/tomcat.conf |
| 216 |
- exeinto "${dest}"/gentoo |
| 217 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
| 218 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
| 219 |
-} |
| 220 |
- |
| 221 |
-pkg_postinst() { |
| 222 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
| 223 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
| 224 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
| 225 |
- |
| 226 |
- elog "To manage Tomcat instances, run:" |
| 227 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
| 228 |
- |
| 229 |
- ewarn "Please note that since version 10 the primary package for all implemented APIs" |
| 230 |
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" |
| 231 |
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." |
| 232 |
- |
| 233 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
| 234 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
| 235 |
- |
| 236 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
| 237 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
| 238 |
-} |
| 239 |
|
| 240 |
diff --git a/www-servers/tomcat/tomcat-9.0.60.ebuild b/www-servers/tomcat/tomcat-9.0.60.ebuild |
| 241 |
deleted file mode 100644 |
| 242 |
index 164acb30f6e5..000000000000 |
| 243 |
--- a/www-servers/tomcat/tomcat-9.0.60.ebuild |
| 244 |
+++ /dev/null |
| 245 |
@@ -1,190 +0,0 @@ |
| 246 |
-# Copyright 1999-2022 Gentoo Authors |
| 247 |
-# Distributed under the terms of the GNU General Public License v2 |
| 248 |
- |
| 249 |
-EAPI=8 |
| 250 |
- |
| 251 |
-JAVA_PKG_IUSE="doc source test" |
| 252 |
- |
| 253 |
-inherit java-pkg-2 java-ant-2 prefix |
| 254 |
- |
| 255 |
-MY_P="apache-${PN}-${PV}-src" |
| 256 |
- |
| 257 |
-# Currently we bundle binary versions of bnd.jar and bndlib.jar |
| 258 |
-# See bugs #203080 and #676116 |
| 259 |
-BND_VERSION="6.2.0" |
| 260 |
-BND="biz.aQute.bnd-${BND_VERSION}.jar" |
| 261 |
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" |
| 262 |
- |
| 263 |
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
| 264 |
-HOMEPAGE="https://tomcat.apache.org/" |
| 265 |
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz |
| 266 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} |
| 267 |
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" |
| 268 |
- |
| 269 |
-LICENSE="Apache-2.0" |
| 270 |
-SLOT="9" |
| 271 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
| 272 |
-IUSE="extra-webapps" |
| 273 |
- |
| 274 |
-RESTRICT="test" # can we run them on a production system? |
| 275 |
- |
| 276 |
-# though it could work with 4.22 and upstream uses 4.20, |
| 277 |
-# we still use 4.15 because 4.20+ is currently built with java 11 |
| 278 |
-# and it would force Tomcat to use at least java 11 too |
| 279 |
-ECJ_SLOT="4.15" |
| 280 |
-SAPI_SLOT="4.0" |
| 281 |
- |
| 282 |
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 283 |
- dev-java/glassfish-xmlrpc-api:0 |
| 284 |
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} |
| 285 |
- dev-java/wsdl4j:0" |
| 286 |
-RDEPEND="${COMMON_DEP} |
| 287 |
- acct-group/tomcat |
| 288 |
- acct-user/tomcat |
| 289 |
- >=virtual/jre-1.8:*" |
| 290 |
-DEPEND="${COMMON_DEP} |
| 291 |
- app-admin/pwgen |
| 292 |
- >=dev-java/ant-core-1.9.13 |
| 293 |
- >=virtual/jdk-1.8:* |
| 294 |
- test? ( |
| 295 |
- >=dev-java/ant-junit-1.9:0 |
| 296 |
- dev-java/easymock:3.2 |
| 297 |
- )" |
| 298 |
- |
| 299 |
-S=${WORKDIR}/${MY_P} |
| 300 |
- |
| 301 |
-PATCHES=( |
| 302 |
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" |
| 303 |
-) |
| 304 |
- |
| 305 |
-BND_HOME="${S}/tomcat-build-libs/bnd" |
| 306 |
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" |
| 307 |
-BND_JAR="${BND_HOME}/${BND}" |
| 308 |
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" |
| 309 |
- |
| 310 |
-src_unpack() { |
| 311 |
- unpack ${MY_P}.tar.gz |
| 312 |
- |
| 313 |
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" |
| 314 |
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" |
| 315 |
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" |
| 316 |
-} |
| 317 |
- |
| 318 |
-src_prepare() { |
| 319 |
- default |
| 320 |
- |
| 321 |
- find -name '*.jar' -type f -delete -print || die |
| 322 |
- |
| 323 |
- # Remove bundled servlet-api |
| 324 |
- rm -rv java/javax/{el,servlet} || die |
| 325 |
- |
| 326 |
- eapply "${FILESDIR}/${PN}-9.0.58-build.xml.patch" |
| 327 |
- |
| 328 |
- # For use of catalina.sh in netbeans |
| 329 |
- sed -i -e "/^# ----- Execute The Requested Command/ a\ |
| 330 |
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |
| 331 |
- bin/catalina.sh || die |
| 332 |
- |
| 333 |
- java-pkg-2_src_prepare |
| 334 |
-} |
| 335 |
- |
| 336 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
| 337 |
- |
| 338 |
-EANT_BUILD_TARGET="deploy" |
| 339 |
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" |
| 340 |
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
| 341 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
| 342 |
-EANT_NEEDS_TOOLS="true" |
| 343 |
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" |
| 344 |
- |
| 345 |
-# revisions of the scripts |
| 346 |
-IM_REV="-r2" |
| 347 |
-INIT_REV="-r1" |
| 348 |
- |
| 349 |
-src_configure() { |
| 350 |
- java-ant-2_src_configure |
| 351 |
- |
| 352 |
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" |
| 353 |
-} |
| 354 |
- |
| 355 |
-src_compile() { |
| 356 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" |
| 357 |
- LC_ALL=C java-pkg-2_src_compile |
| 358 |
-} |
| 359 |
- |
| 360 |
-src_test() { |
| 361 |
- java-pkg-2_src_test |
| 362 |
-} |
| 363 |
- |
| 364 |
-src_install() { |
| 365 |
- local dest="/usr/share/${PN}-${SLOT}" |
| 366 |
- |
| 367 |
- java-pkg_jarinto "${dest}"/bin |
| 368 |
- java-pkg_dojar output/build/bin/*.jar |
| 369 |
- exeinto "${dest}"/bin |
| 370 |
- doexe output/build/bin/*.sh |
| 371 |
- |
| 372 |
- java-pkg_jarinto "${dest}"/lib |
| 373 |
- java-pkg_dojar output/build/lib/*.jar |
| 374 |
- |
| 375 |
- dodoc RELEASE-NOTES RUNNING.txt |
| 376 |
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
| 377 |
- use source && java-pkg_dosrc java/* |
| 378 |
- |
| 379 |
- ### Webapps ### |
| 380 |
- |
| 381 |
- # add missing docBase |
| 382 |
- local apps="host-manager manager" |
| 383 |
- for app in ${apps}; do |
| 384 |
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
| 385 |
- output/build/webapps/${app}/META-INF/context.xml || die |
| 386 |
- done |
| 387 |
- |
| 388 |
- insinto "${dest}"/webapps |
| 389 |
- doins -r output/build/webapps/{host-manager,manager,ROOT} |
| 390 |
- use extra-webapps && doins -r output/build/webapps/{docs,examples} |
| 391 |
- |
| 392 |
- ### Config ### |
| 393 |
- |
| 394 |
- # create "logs" directory in $CATALINA_BASE |
| 395 |
- # and set correct perms, see #458890 |
| 396 |
- dodir "${dest}"/logs |
| 397 |
- fperms 0750 "${dest}"/logs |
| 398 |
- |
| 399 |
- # replace the default pw with a random one, see #92281 |
| 400 |
- local randpw="$(pwgen -s -B 15 1)" |
| 401 |
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
| 402 |
- |
| 403 |
- # prepend gentoo.classpath to common.loader, see #453212 |
| 404 |
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
| 405 |
- |
| 406 |
- insinto "${dest}" |
| 407 |
- doins -r output/build/conf |
| 408 |
- |
| 409 |
- ### rc ### |
| 410 |
- |
| 411 |
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
| 412 |
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
| 413 |
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
| 414 |
- |
| 415 |
- insinto "${dest}"/gentoo |
| 416 |
- doins "${T}"/tomcat.conf |
| 417 |
- exeinto "${dest}"/gentoo |
| 418 |
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
| 419 |
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
| 420 |
-} |
| 421 |
- |
| 422 |
-pkg_postinst() { |
| 423 |
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
| 424 |
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
| 425 |
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
| 426 |
- |
| 427 |
- elog "To manage Tomcat instances, run:" |
| 428 |
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
| 429 |
- |
| 430 |
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
| 431 |
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
| 432 |
- |
| 433 |
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" |
| 434 |
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." |
| 435 |
-} |
Archives