commit: 44398f4ce33f848a5f29c76c2e37ba66dd0ad9ab Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Jan 11 15:12:53 2026 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Jan 11 15:28:22 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44398f4c
www-servers/tomcat: drop 9.0.111, 10.1.48, 11.0.13 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/45329 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> www-servers/tomcat/Manifest | 6 - www-servers/tomcat/tomcat-10.1.48.ebuild | 182 ------------------------------ www-servers/tomcat/tomcat-11.0.13.ebuild | 186 ------------------------------- www-servers/tomcat/tomcat-9.0.111.ebuild | 181 ------------------------------ 4 files changed, 555 deletions(-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 8831e4dd9ba0..9d4276994b82 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,12 +1,6 @@ -DIST apache-tomcat-10.1.48-src.tar.gz 7269762 BLAKE2B e3458a202e9e42000300926c26391d3cf16f827276596fc598b7e822c60c7ea16910a4d9093e7c26c07e504258d75d97a8fbcade37e7886d2c51836aade701ef SHA512 2f136e84e87811a31fde122f14d3b4aa6f0fd4a9e1a78015ff68ec31898cb8d7c1e14363464507ac987bc74b40cdfffc393faa0e04749ad9da8f32c6e84b5421 -DIST apache-tomcat-10.1.48-src.tar.gz.asc 833 BLAKE2B 77143a702afd36f779417dec5c0b838928fda5520536e706f1b27f722d133112488351fd433c5acc6dbba80c39bd671cf7c251ca323428348b0e5197528d9f88 SHA512 8ce77c7ed01c97eed060159a26a24ebe48d0df06200ebdc1d2a27759c46987da15309958cc292095873e2b3f26da17f4151e93a918a8f4195b402390aa977e65 DIST apache-tomcat-10.1.50-src.tar.gz 7282665 BLAKE2B c92a4b5d213279aaf71edc96cfcafce24754a8dfc54e0837722e61ac9b96a8f75bf3cba50697c14164cadf0d1cc687396cd8a4c14e5eabaa9fe85856e35931cc SHA512 d6392d8850e451cb96ba61169e2bf9f3c1585fe806fcdf64257d5e99b4a4f342b4846fed5ba36dcf3eef5a6a2fead8fb535f59419da2f5e57315cfe5ee2fcf26 DIST apache-tomcat-10.1.50-src.tar.gz.asc 833 BLAKE2B e607140e5a88ee4c015b27b3b6e61b985a53dac573d19e6acfe940bbff59aca0f50126803f5ad7d9ca3e5d7ff22205bc4bc60cd79de58ae9abcc7ffb5dbced1d SHA512 b54bed1c11e3a1e95fd13fb74a4987b82af11c0f83f87eb2e01294cd517ec6a4523185b8a14e2527ff52d6c99c654385e13b8fe3cf3e9631263d3659f3074b93 -DIST apache-tomcat-11.0.13-src.tar.gz 7191673 BLAKE2B ec4be9ba9f7d5d999bc53214419bfe028351b921dc7b3f97c900982a0152c7d8f42d8b0dc73dd5c808cd1e8e904f558b6c15112008ac573b13656d4311201c7b SHA512 be2b4c7ccdb7065f6862dd90e0ca0d09de08d68d25472044736a35e96dd6d3c37f8606ef2b321051454e31d210bf1a08a2cf6099a763d8d6610632666070315c -DIST apache-tomcat-11.0.13-src.tar.gz.asc 849 BLAKE2B 5380a3d02580c48ba4d0a6551da2d36872354fdeb6c02c220a3de7c2bf70563ee7b23ab91f5e955dd3ffa7c272706c1373e36f76c5986a74723c893f2a99a2e1 SHA512 03395c1f06bc49adf3d8eb1fab81fe0ed3cbeaca540f26e6060158b7ca27b1213b34a0fe9f123d26d2d5e8a9b8440c0d0c03bd1dd317c27df50db89ede12de9d DIST apache-tomcat-11.0.15-src.tar.gz 7201779 BLAKE2B 82dcdd8a2b8dad6131dd6e9beac498343c55182ca01f43b523d3cdde0c349d8d3a8e0a56d3b2b3e92a77a76bc59ec9a72ffdb45961056e1511e714a839aa87bb SHA512 b1cc6d3420c6bc813bd1db3b6a5831c1106941220de3f042149095884e4dbf8b6fbc36d70bc1a131ee0084b32062fc8039c185cfb75d35ec3ba6dc7bf9cf5f7f DIST apache-tomcat-11.0.15-src.tar.gz.asc 849 BLAKE2B d45e5eeb5cdf9c28765433502ecc36e9550153a5e272d35c809d4f6e76f72e062043cc60d668599d6bd2137ba22349f05f4225c2b6d8dda45b6c72ceb5d5a237 SHA512 5a8e3f8314c9f12b1cf56c90f568200e64fc9c4526d9c10d4b9c555c903527548eaca1b0082c37c662b453000028b969bffb5797e324558704356449423d524c -DIST apache-tomcat-9.0.111-src.tar.gz 7411297 BLAKE2B 7728dfda254fedb2f780c1b56c41b3ac9d9bc8a447f60c11884ae5e2940acf622e47aa4576975e9fd5f981d99b1ebe6cc82af842453629cc28372f082602c3d6 SHA512 aa27b0e104cecb2d75853fc46ddae2bccda12ebb1c0e86e51731f7183028e17970dbacfd9d0f5534b32ea4c1d1f68bb0dac510aa71944ea686a545cf8e5adb40 -DIST apache-tomcat-9.0.111-src.tar.gz.asc 833 BLAKE2B bb6b6a86a251f3ed2daf9ce20af902fe99593c9c3185f5f6e9ddbe1f98baac51557a7e710942d0f444690b9a0b755fca7543f7f600df4f55e966a9c86fe32d91 SHA512 2592cc95ea36a951c96063992e3a3c8fd08e23367e2fdee6455673d461de3175d3f29ed01b255820e3cb37318635d65a18635e5e7b3a0879b69c74ac0cf0d21e DIST apache-tomcat-9.0.113-src.tar.gz 7421723 BLAKE2B e68848e07ea8f57256a8cb062c8472f7f883f805f1b0bdc13aa8c4f41315f30590642f99b4577751ac54aa400bbc4688511a6a967cbd4049734598ff3dedae5c SHA512 93d89a0501d428b3652960d45bd5d7db701d949386bfca05d4fe7ed63d95aa82c62611d25daa1ca959ae562ea82d1717144365a2e0a4770e7a96e9c94b2a7e33 DIST apache-tomcat-9.0.113-src.tar.gz.asc 833 BLAKE2B 268ce09c40a008fc6c8512a7031cc06890c75f5616c4d0287cd113867153c3ea0a3f862fcbbfe65b1dea24c4de786b7c319bd12203e82d655f66b333ccf35655 SHA512 f8338631a94739edd2158f6bdca5daf3bf50f4087ee5b5bff034de1a2d83a8ba05d02f06b88a24bbaaad781ed3dc450372fe5c5e02f68905db9bb9672063c6bc diff --git a/www-servers/tomcat/tomcat-10.1.48.ebuild b/www-servers/tomcat/tomcat-10.1.48.ebuild deleted file mode 100644 index 453b37eba5e8..000000000000 --- a/www-servers/tomcat/tomcat-10.1.48.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" -HOMEPAGE="https://tomcat.apache.org/"; -SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="amd64 ~arm64" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.26" - -COMMON_DEP=" - >=dev-java/ant-1.10.15:0 - dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - dev-java/wsdl4j:0" -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - || ( virtual/jdk:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-10.1.20-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"; -} diff --git a/www-servers/tomcat/tomcat-11.0.13.ebuild b/www-servers/tomcat/tomcat-11.0.13.ebuild deleted file mode 100644 index 54a180327d05..000000000000 --- a/www-servers/tomcat/tomcat-11.0.13.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container" -HOMEPAGE="https://tomcat.apache.org/"; -SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="11" - -KEYWORDS="amd64 ~arm64" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.37" - -COMMON_DEP=" - >=dev-java/ant-1.10.15:0 - dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - dev-java/wsdl4j:0" - -# jre-17:* because of line 1081, build.xml -# <filter token="target.jdk" value="${compile.release}"/> -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-17:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - || ( virtual/jdk:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-11.0.0-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars --build-only jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars --build-only wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"; -} diff --git a/www-servers/tomcat/tomcat-9.0.111.ebuild b/www-servers/tomcat/tomcat-9.0.111.ebuild deleted file mode 100644 index 3d13ca5edd99..000000000000 --- a/www-servers/tomcat/tomcat-9.0.111.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/"; -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="amd64 ~arm64" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.20" - -COMMON_DEP=" - dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - dev-java/wsdl4j:0 -" - -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - dev-java/javax-persistence-api:0 - >=virtual/jre-1.8:* -" - -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.15:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - || ( virtual/jdk:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - ) -" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-9.0.104-build.xml.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"; -}
