gentoo auto-resync : 07:05:2024 - 00:00:56

4 files changed, 4 insertions, 183 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index beda8d981243..d60bc231efae 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -28,7 +28,6 @@ EBUILD tomcat-10.1.19-r1.ebuild 5350 BLAKE2B 7d3b63019f30cc7b8a38cfbd257d362ed02
 EBUILD tomcat-10.1.20-r2.ebuild 5433 BLAKE2B ede4815f60ce460b81f54b3ff04bfb7765c3747a9ea9c48148c2b9b9c178b4c1ada35da41c0c86bba35e8480201b9eb822b7977d68e41f62fe28b38e18f24cf9 SHA512 21b83c140047dba6cc46109536251a9d577308a25b9952265a141e1d7871ba54eaea4c479d011e9988ef875dc2cb855648a0a44168b6537c662662ed7838884d
 EBUILD tomcat-10.1.23.ebuild 5433 BLAKE2B ede4815f60ce460b81f54b3ff04bfb7765c3747a9ea9c48148c2b9b9c178b4c1ada35da41c0c86bba35e8480201b9eb822b7977d68e41f62fe28b38e18f24cf9 SHA512 21b83c140047dba6cc46109536251a9d577308a25b9952265a141e1d7871ba54eaea4c479d011e9988ef875dc2cb855648a0a44168b6537c662662ed7838884d
 EBUILD tomcat-8.5.100.ebuild 4591 BLAKE2B de0c44c69c4f6440ce013411b70d601e25d603d671fa7d079abceaf3a76037478fd75b08ae7e06928131416b403404e862284225aac2789b7d4bdcad3c891dc1 SHA512 12a45ee3bd7b55beede9489680f7720d836fb1375769cda121771f72bdb927a44e72540e2a55cfa9a0999ea5481d4f2de0faf73bd4b380465906e32282377725
-EBUILD tomcat-9.0.87-r1.ebuild 5200 BLAKE2B 20d33eb5521f175901b4b3e5f9296ac2c24155d4b51153af34f22d7a72a4731b7b9e64b534b03359267d61a55135700da3840682155c5f02b884a606946fa83d SHA512 a744b21c16d19810f4d45bdcc53f08b5d711e2ca25a51a6dcab20671417db99682a459454fa6167b7ff406b98e2356093b1808ff00b43e60ba2c32b4865b45ce
-EBUILD tomcat-9.0.87-r3.ebuild 5025 BLAKE2B b0c33997104822455c369451c06a05fce6b003006f98f8d38c8baa372112c7e86bb2732ff942907ed95e292cf04047c51c8f57ac757af5fe7a58d3b475b99c73 SHA512 a56e10dfba72afff7ebab04a00c63529315e563a7c632b2fd836dfc581fbfd8139f26d5507b4fffce715cfad31abb342a4b81be45d578e9f0301e0022ac18596
-EBUILD tomcat-9.0.88-r1.ebuild 5013 BLAKE2B 969e71df1100bbe3b97d0a1ef9c6e4f6ee819a652f9a14b1c7e4bff837a31ee5b602c7df834c23e1095ea310595a0c02c02aefe7d32458d621aa5385019cd71f SHA512 fc60561c17f6df18543409f1c55a13592fab8fd524ad29495ce32a38948ef9fd8949a3794211731a81f566b7681767f52e307ceb9a0f560237959265a44c8f58
+EBUILD tomcat-9.0.87-r3.ebuild 5030 BLAKE2B 518eed7bbfd39fe6616a212d6e1b2b84e1f1603b36c592ed8cb107f8fe4ae3e71f1962c5099b41628b90ab8e7b8af64630bc1bb8d643b90639153b76e2a6c87c SHA512 57e53b9344f6f7d3f20371f106f6ac82a74f9f883b95ef3daa7ceab043bee2cd990c78a9d45561c68eb79a170ea69bace8c4bedd8b9f763dfbecb6701350d1e1
+EBUILD tomcat-9.0.88-r1.ebuild 5018 BLAKE2B 18aa3279abebfcbcfeb8e6c09ea0a36ab61a8041ce1105770739a79646de699089ffe530b6e85e6b07f9c7c007ba921f722dcce3d25a4a8e45bc2a988c32aa6c SHA512 e69a060a97ffeb2aae1428e87630d9ce87bb31681eb6b04d5723a32afda44e21d4996babd4f98bb42e0abe5f0a1851a46b95982d4d75b45dcd605a6acd2f2584
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/tomcat-9.0.87-r1.ebuild b/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
deleted file mode 100644
index 7af892a7c28b..000000000000
--- a/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar
-# See bugs #203080 and #676116
-BND_VERSION="7.0.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-
-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
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.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?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-
-COMMON_DEP="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
-	>=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}/${PN}-9.0.50-insufficient-ecj.patch"
-	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BND_JAR="${BND_HOME}/${BND}"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-	fi
-
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# 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
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_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"
-}
diff --git a/www-servers/tomcat/tomcat-9.0.87-r3.ebuild b/www-servers/tomcat/tomcat-9.0.87-r3.ebuild
index a74c42f50b6d..f4a3a79e6455 100644
--- a/www-servers/tomcat/tomcat-9.0.87-r3.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.87-r3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.88-r1.ebuild b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
index 0289b98b1140..ca10cc20e118 100644
--- a/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?