www-servers/tomcat: add 9.0.96

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38891/commits/118ed4938a48bc8e4482a3c821e7e75782db17fd
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

2 files changed, 174 insertions, 0 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 14306b75a931..50fbfec1b3bc 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,3 +6,5 @@ DIST apache-tomcat-9.0.93-src.tar.gz 6472760 BLAKE2B 85e7da7eca0ac2a6d73b92b7eec
 DIST apache-tomcat-9.0.93-src.tar.gz.asc 833 BLAKE2B 93f12701716013d17c4b3dc9b18713274fd1ad0f4455c3ef1bd9469920fc337f8f75784b961a8b83de90da28aff5b9e6e6a12cfc9aa217f9af4826fc6ee51871 SHA512 90977bc66413f1962cc1a00e645718e0f9cec93295110c29685df6cd62602994d142b6909087d7eece05b28fae5194d2c9a42c12027e6cb6e82c177d1fcd4f51
 DIST apache-tomcat-9.0.95-src.tar.gz 7066563 BLAKE2B 9d00ad14c8bdbd9f63d9a9dc1651a36430eee09ebeb6c0b313802236544243866d75d7ca33544bcc8e9cdf4d3f636b9ccd8f754ea3212fe1c221b292d8a74984 SHA512 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db
 DIST apache-tomcat-9.0.95-src.tar.gz.asc 833 BLAKE2B 51dcbb097426b7678296926690da9b18f617962a207eeaa3b6f9744dd285f3aa33b21da52573e066d536724e85c702dfde9995b674d79c47b48d8e29e09c3ebd SHA512 441ce2923fc5ae1d1fde9b3ee9de8eb0867528094f62cdc02fa7117a40523cbd16e81a5b815e40db02f85e9bed20ebee41115d87a4652ab5b7375e777e93ce16
+DIST apache-tomcat-9.0.96-src.tar.gz 7042818 BLAKE2B de7d573a2ee83ffe997f65ff2b66b8205efdb05c7155e6e6982c5ff0406b0f7ddf1a93978b758c956e5fee8f5b8df8880ef55b4009248a2477f26dc1da30a8b0 SHA512 cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884
+DIST apache-tomcat-9.0.96-src.tar.gz.asc 833 BLAKE2B 6df8c0c7ee73b9104c102c1c4c0f2030728de90a968efc26a0c85537d7876a0402bc66fea9a3a398be8f210c6255b5741ee969a0633cdecd95268731615f8635 SHA512 37404f8687b0bfc761611402ac4581e98063a229f9a4b40d4b4c6fc25e966d48a2b951cdd198cf60930bb7b776ebce6ef02eeaa89e51351120b462ae1b20e54c
diff --git a/www-servers/tomcat/tomcat-9.0.96.ebuild b/www-servers/tomcat/tomcat-9.0.96.ebuild
new file mode 100644
index 000000000000..14e23d60b567
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.96.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+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
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-1.10.14-r3: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-17:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit]
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+	"${FILESDIR}/tomcat-9.0.87-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"
+}