From 04c6fb8761e87eee28adcdc8daa2071cfe3b4abb Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Fri, 20 Nov 2026 17:07:15 +0100 Subject: [PATCH] www-servers/tomcat: drop 9.0.123, 10.1.61, 11.0.27 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://bugs.gentoo.org/986846 Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/2479 Merges: https://codeberg.org/gentoo/gentoo/pulls/2479 Signed-off-by: Miroslav Ć ulc --- www-servers/tomcat/Manifest | 6 - www-servers/tomcat/tomcat-10.1.61.ebuild | 184 ---------------------- www-servers/tomcat/tomcat-11.0.27.ebuild | 185 ----------------------- www-servers/tomcat/tomcat-9.0.123.ebuild | 180 ---------------------- 4 files changed, 555 deletions(-) delete mode 100644 www-servers/tomcat/tomcat-10.1.61.ebuild delete mode 100644 www-servers/tomcat/tomcat-11.0.27.ebuild delete mode 100644 www-servers/tomcat/tomcat-9.0.123.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 12434603defb0..84815f68f6698 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,12 +1,6 @@ -DIST apache-tomcat-10.1.61-src.tar.gz 7788583 BLAKE2B 062db6568a06ffae02110aa3964188630ac7802f92e35767f23804093b9b7ded9d224298d823acc57fea189af80febf0349af2d68153f5c3a2de342f3cc6c7e9 SHA512 cb451eab939670525fe462203dcac717511d29ff6201d31a8bad284848d9c0284b5241d9e5004fa881ff5e92a7827bcbf17ad670faa328e4666651240e4e92f6 -DIST apache-tomcat-10.1.61-src.tar.gz.asc 833 BLAKE2B 82caf29a8de3e21535460f1033fce51ea4638188033b8dc94b57cae0c779ec8ec6ac742339955a77a77eed605ebbd97659d26d48eb02cabbee91f6e5aa74a17e SHA512 4c269eadf7aaa59e4fbd219a2a5146ae602a1a1def4d60436bece35b17bff75a28ff8f2ae5583cc01ef6c1631697fb7b851d8ef014cd6709700dbc1f5cfde620 DIST apache-tomcat-10.1.62-src.tar.gz 8798347 BLAKE2B cbd5f24b1a2211096df400c3392db5a6f11cc6d5ca5eca6ef808e62c2f955d056e01c2c484bdc6a25551fa7f5cfb5a717c57161e3e5d9d58a9fd23794f99e665 SHA512 07803ef5c7fdbcd9d8069350aa9a52a83b637ee8abbc98fd7e2db6fd23f68759dfd05f0cb72fafed97a40930cd383070a269d3c3447b81ea742e1ddab4565722 DIST apache-tomcat-10.1.62-src.tar.gz.asc 833 BLAKE2B 19e4a3c20147b4e8e7b4a4f631287e33af614731e66cbcbe7589eb248ad23de7c8fb058fd824295562455f7e1761f99029099f3a510f37b8717c370056d7bb61 SHA512 4745455d01a38d52804fffeea0df380593911755ce8b90474e1ed98b1fab8c8282c04202d5a44d7adab66200225b2cb1122c97c4527e5c0a237a20f5cc1860cd -DIST apache-tomcat-11.0.27-src.tar.gz 7712959 BLAKE2B 36fbada02c13f144755f3092e28857d1080315af3f58062a7f25a37ad3c9955665d2508e632251669d5e589447f5cd0cc78edc08350e5c3594156a6b2b94d750 SHA512 931fd67cfd5dcaf3eeffb9e75a78175dba70ed87ab9161ed120747e2f425e34c8d0c67e4e9000a9e30ff4c5124bf3686936d4072f6c5e0a1ef6d5b2354753041 -DIST apache-tomcat-11.0.27-src.tar.gz.asc 849 BLAKE2B 50a186c7786c8437fa42fb0ee777148826614bac53a50876e95e05fc71a38168a8a30eb5d43d3f1820f1e52497206b0187a5f3a2baa608e0bc124b914f5728c4 SHA512 f7a2cb3ece420cc8cbdcef0eb567aaf80b3af2cd8938f5ecf6f421f5cd81074028985f28fd81ff50562da9015ba36871be2dcf72f3e2bc821c7b57dedb014b39 DIST apache-tomcat-11.0.29-src.tar.gz 8728739 BLAKE2B aaedc2495f79012b9bfa576a6dce093235bc1f6c39a85351661216cf005c51314971eee1a08116ab90caf4de3237f6de3995464f408e9de3ae9fb41f84625bc9 SHA512 b7bfffde6c1d6b7592b5eac121b1316e5c49e875f8fcb312ce2288523cb047dbe388640270f894dca4b34d3783a82228d5efbd53392073b5794d04d1bae6286a DIST apache-tomcat-11.0.29-src.tar.gz.asc 849 BLAKE2B dface6fec02217dabfd869691f74971692f4585e008b65301c9996687329d182b41a9fbcca52861349aa6fa8a64ade46f890717012669c5cb9957573f483f489 SHA512 cbc9779c4794d107d412a6cfcb6bdb59a36e387485d87f8c6d3134ae648a0662ce937a434e9b0e3d9d12ff6d07788b0fcaa38d1fa445965760c2eb730ab0eb22 -DIST apache-tomcat-9.0.123-src.tar.gz 7908277 BLAKE2B 5b56c46a3a200821d2a90a77b553ff1901ea6aa3272709811684f1cc087cd407715b8cbad2112fe5f0b59515117dd03d3daf01135fb7f9124e10da224f4383b4 SHA512 e0286ba3ac94818c49ce46c668660a30816254e8d82bcdf058d6c5dd3fb8d485cd2c625e99de513846cea3be396f02204f44361f8b7b9e325635c040a61dd897 -DIST apache-tomcat-9.0.123-src.tar.gz.asc 833 BLAKE2B c3106a2b35ae57c42f63f8a0806520b67b78e9566e43b4af909f0acee61e35ea4e2199022af8c2fe98e4480f0e53a880f23def6a1e0235c3d8f3c42adff4277b SHA512 5117660fb81a969dfb0efd51a34be8b23073e2b2cfeec8dd02d0c26c15f98e20a290e8395634c8e4ab3aedfaddccbed37f6b0bfac1ba2d7488c12ad5c19623e2 DIST apache-tomcat-9.0.124-src.tar.gz 19829657 BLAKE2B 0ffe1dfe8d24a7819668d37bcbec0515a627f4dd0f981334a2934d91ef539fb413d503d7099546ec04407d54459d3fc4eb90688fe18256f31b0e8068f132a9d5 SHA512 88c9682df8e7db7da17f668af24422b16cfba29afbfc3c0cf197022405aa883ec9be42a653b4dda024328055985bcee0226c9a7c7f793a2e7ac2eeb8b815eb79 DIST apache-tomcat-9.0.124-src.tar.gz.asc 833 BLAKE2B f8e5c9da69e64038740d814b5743b4dd881393a050412a798d79ddf2aabbd86fac970c90f6e0633448ed0da4d501f4e644431c9864c5e11c18e2a64589227154 SHA512 ef1a8e76aaea498d2418267ba60df3482de5601f945c6132308a24d016b1ff048f9440ea3fcbe686f1a32e7b54556be7c50f994ef0eb138f7ab16bdbe08eb24f diff --git a/www-servers/tomcat/tomcat-10.1.61.ebuild b/www-servers/tomcat/tomcat-10.1.61.ebuild deleted file mode 100644 index 55a0bcb07d195..0000000000000 --- a/www-servers/tomcat/tomcat-10.1.61.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=9 - -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? - -BND_MIN="7.4.0" -ECJ_SLOT="4.26" - -COMMON_DEP=" - >=dev-java/ant-1.10.15-r1:0 - >=dev-java/bnd-annotation-${BND_MIN}:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.13:0 - >=dev-java/wsdl4j-1.6.3-r1:0" - -# jre-17:* because of line 1081, build.xml -# -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/bnd-${BND_MIN}:0 - >=dev-java/bnd-ant-${BND_MIN}:0 - >=dev-java/bnd-util-${BND_MIN}:0 - >=dev-java/bndlib-${BND_MIN}:0 - >=dev-java/libg-${BND_MIN}: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-5.7.0:0 - )" - -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() { - 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 deploy $(usev doc 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.27.ebuild b/www-servers/tomcat/tomcat-11.0.27.ebuild deleted file mode 100644 index ce2a3af5b1e69..0000000000000 --- a/www-servers/tomcat/tomcat-11.0.27.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=9 - -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? - -BND_MIN="7.4.0" -ECJ_SLOT="4.41" - -COMMON_DEP=" - >=dev-java/ant-1.10.15-r1:0 - >=dev-java/bnd-annotation-${BND_MIN}:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.13:0 - >=dev-java/wsdl4j-1.6.3-r1:0" - -# jre-17:* because of line 1081, build.xml -# -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-17:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/bnd-${BND_MIN}:0 - >=dev-java/bnd-ant-${BND_MIN}:0 - >=dev-java/bnd-util-${BND_MIN}:0 - >=dev-java/bndlib-${BND_MIN}:0 - >=dev-java/libg-${BND_MIN}: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-r1:0[junit] - >=dev-java/easymock-5.7.0:0 - )" - -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() { - 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 deploy $(usev doc 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.123.ebuild b/www-servers/tomcat/tomcat-9.0.123.ebuild deleted file mode 100644 index ebbc3d1cc5a9d..0000000000000 --- a/www-servers/tomcat/tomcat-9.0.123.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=9 - -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? - -BND_MIN="7.4.0" -ECJ_SLOT="4.20" - -COMMON_DEP=" - >=dev-java/bnd-annotation-${BND_MIN}:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/wsdl4j-1.6.3-r1: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-${BND_MIN}:0 - >=dev-java/bnd-ant-${BND_MIN}:0 - >=dev-java/bnd-util-${BND_MIN}:0 - >=dev-java/bndlib-${BND_MIN}:0 - >=dev-java/libg-${BND_MIN}: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-r1:0[junit] - >=dev-java/easymock-5.7.0:0 - ) -" - -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() { - 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 deploy $(usev doc 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" -}