gentoo auto-resync : 27:05:2024 - 00:07:23

6 files changed, 2 insertions, 323 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 298f11c8aca2..733fce285de4 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9263cad854ae..62cb625874ca 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,6 @@
 AUX tomcat-10.1.20-do-not-copy.patch 1164 BLAKE2B 4df0dc611ab7694d784adfaf132502c8e11b60f91a8dbb5e1385ed44e965f175660e9d5ed29d0e32d1b77a614d1bb41499bcc987e109d41bc1acd5876ace3c0c SHA512 e7a1f058566a44b6b88f3c968cddb7effe9301aadc199d127bf8269c847ecc6a2c4ad8d09b3d489dba49eff79e69e033e3acb729fd7337ec8bb378aa65c0bdfa
 AUX tomcat-10.1.20-offline.patch 562 BLAKE2B 338f3fe3604004ab2920d67c39facb41d506a3a56c5fe7d1c11f4fa11b8391aac7b0088b46be3b4ef5ffef7590b525f09a53985abc8d753999a548ea9a2f31c5 SHA512 0f814adf5a837985b14aca22fd1e41f36eff74c6065577a5fb46df19c67cfd85aac86edbdd12f009014c9a96342baa8db74130d0020c0390e74bdfa5cd7a56e6
 AUX tomcat-10.1.6-build.xml.patch 4856 BLAKE2B ed44d53877c96f06cab6354b034f88ba3382c34eaf504f10c9fcaaaf2b0c812901f3bfca8114f2aab4faa2604800f81f18932ac12065d09846f879edc1eaad96 SHA512 005d0b3fe6e14dca303bc3d5c4ab1fbf35a309be9a8ffcebd24e739301f33f202616e17973dd954bd1bd1ae89978c3147593d42ee2508c56026579d37722470b
-AUX tomcat-8.5.86-build.xml.patch 4164 BLAKE2B 27aba54a5a8e570a9e73ff1133dcdc43ac9536bb2cb8b2542fe3eb12c2c92145066c8d742ff35a6b320515cb91ce9a17a1b0e7954623a68326677b42547f1027 SHA512 7f924be4b979178fc92d7a3b63224c87860ae1795b2cc10e734ff8518d6ab3b15138718ed392b1fb747457d4abf5acf9b5fac13f321cd7e8dd7fe832c0e82577
-AUX tomcat-8.5.95-min.java.patch 1435 BLAKE2B 016eff198e0da7a9659a96e31fd50a0da51841a44920f39eadfb87c634485db843e45ca5fca581c2fe19ac20e2b206099fa6c6820bb3502d3d5011417fe2a83e SHA512 8fa4ec05f2dcfd919abf3b0ef5b33351d22bb882bf11df43742c28ead7c8f868bfc9792f77f3b17dbd38baa5c68c60d1e4e7f4a8c2472f889592975cf45295e2
 AUX tomcat-9.0.37-fix-build-rewrite.patch 448 BLAKE2B 323a726c80b04a225e47b04506969116bccda3fdddca6e00bab85a8a758b58b5461792b8419d56e3f55742218a9dd36ab11e14d7af49ba1be4c8543f1a6c1fb3 SHA512 58413426f3997af610819f55a63c161b5ae2953337fdaddd854b3f4fb239f198434731598d23858cf5911d7506387907a14c0f1cca0df5801767c1f868bf9a07
 AUX tomcat-9.0.87-build.xml.patch 1240 BLAKE2B 26fbfd5ba353fd3f5a02a1feb984eee7b6e5b9ed1f711e969e135e87761f0b6be5503abf93a53ecdfa7de35e00765f1c3a7e057702fe14d62bfb58cc93356b84 SHA512 b62fc4d3a0d2d1134587fe284956a4961b353c730a4084e50f4cbf1ec096a2261c8c77a58940c808e47e5c0a8cdbffdbbb74de45de0251bddff9e461a5fe450c
 AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a6812f5da0237b19a1bc915ac3a0abd1e3e1ad89d59049152c1f3f24b84a45a076375f7dc6784c87ebac440b15ec5557d SHA512 210754982a5ac789aecedd9916d45190c8ca92661b9f492d40b6c4f0758c69a2d5b961150cc83573c9b7890a73fc4e8bd130a2837d6de9164fc8a18bee0e7676
@@ -15,8 +13,6 @@ DIST apache-tomcat-10.1.23-src.tar.gz 6248107 BLAKE2B f14a652b4cbcd27dcecefbea35
 DIST apache-tomcat-10.1.23-src.tar.gz.asc 833 BLAKE2B c1cd63d86406e53a093c7d0325d6ede04bf8b051a23c4b2ff54d20818a583d16aa78b25e02678148eeb6320639e7366bf8851ea983e56ef81e473e6767bd6ab5 SHA512 67d35953ee8ebf685ee441467cc0e0d1fcf760651525e6e34c7ad09e8a4a75b26c0b044fcb7781a1661d1edac24ea92c1881a6728571f14e21d29411d9839c80
 DIST apache-tomcat-10.1.24-src.tar.gz 6230916 BLAKE2B ac2329499d9afa37a62ad00b5ca4954e4221d72623fd821ffd3ca0037209723acba38d03f52033f0ea7e2951c9803f3ab94cd0910ed520424693f03fd2efe5c8 SHA512 cd3113dfaf2dd14aacf8d3c2bf39fb7142665421f981ad668edd228bb0a8fe8c35ea8921930e6fe06d10c9c078f774641901efc1e5312d3b7ef52a3006bacd5f
 DIST apache-tomcat-10.1.24-src.tar.gz.asc 833 BLAKE2B aa1a6b3698b80f16ed567153d42655b425597bacc2cc1aee7a73e8cb20db22c57d827d2400df045a828d1cca017ffc5af1c941b9c0f94369fcf7d52458061b01 SHA512 cedc2128b2877bb4470d06df9618c403c49f488eb5006b3561f39b98b2ff7539819b931813c9af484f62a57a582e36730ed25e8f30a8743631b4d72bca4be386
-DIST apache-tomcat-9.0.87-src.tar.gz 6332438 BLAKE2B 8f4a89d3f5770abe6f60ba0dcac24bfe441b7d33bbde301ba99efed37af6f599e30b42332c2708dca6a572dd703a9adfade42dde9977d4442acc2b8dbad2be44 SHA512 bdfa66fc63c78cf7e2d35c13426b7a0781a3d084a9263a199005b022cfb77bf392e328f604f943e60bb462312ad60f1f12f5785eaf1c4b12ea931f1e96a4e2db
-DIST apache-tomcat-9.0.87-src.tar.gz.asc 833 BLAKE2B 31c0266c0819a2daf6192f7feebfaf534bcdbfda72de169f8c63b017c2a686d191765ec0dd1cb1a63293d03e519747aa85281fd8041482aaf53f80f43db45875 SHA512 e765abdf4442c94422f752578d96d75b1242859bf5d19b8b08d2487f3531ef652eb4b2a4bd70eab5e5c5e83f07fb335b44dda1eec4ea9dacffbb9dfca5d145da
 DIST apache-tomcat-9.0.88-src.tar.gz 6327717 BLAKE2B e79db61e3a8e368124ff151de2d25daf11a65fce9e93a38648d88c2dcdb99524fc34f84832cb02fe8aeda58a84bbc0273613db50c6f85a79d525f9a9227b740e SHA512 bcd568ad5ea4baee23eebd0566c672417c1c9005d6e97dd66edbad8fd82a8a1b5ff9a2867dd2bf5e04f2c056ea3debd67cbe4132e3ef8929ca30c4529b45e6ed
 DIST apache-tomcat-9.0.88-src.tar.gz.asc 833 BLAKE2B 034081347d89b4e10b6296e0fbe8a17189ee27a71593848fdb70cc29a41291ca1edf21d4cc11d674c710505ae93d43a2f5dd08695d6dcfb4776843cc9970edf8 SHA512 608835f309d98099b0c852c553b9116611b44f389efbee85aaac27598546e584daab180acff3b05c00623456354e2719715d9ae24bd3940de39e7bbb48d3e018
 DIST apache-tomcat-9.0.89-src.tar.gz 6319184 BLAKE2B a3c9539fe25a5ca87820214a7b7b8376c05383d940bfa19f7811f3fb5e90e2bd392f46c3f1a08a8949256bde5855bd479ac3754245dc953aa78e5f73e23f8849 SHA512 c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1
@@ -25,7 +21,6 @@ DIST biz.aQute.bnd-7.0.0.jar 16567341 BLAKE2B 329b3b750e917ad513a1f767f63b96b1d0
 EBUILD tomcat-10.1.19-r1.ebuild 5350 BLAKE2B 7d3b63019f30cc7b8a38cfbd257d362ed0227a024e17b0da3b9099d41e9eb20318f066cd433c174db0a1903d4b6237466c730b6e485e8c7f64ede7bd12f4ce15 SHA512 8d0ac9961efa95c92cc5fb69fc7e0001a61f93f7dd041f26eff592f1bc010937505f17475d94ad683608850ba2fa955a926ba6712c09bc6ce0f27da1d667a2be
 EBUILD tomcat-10.1.23-r1.ebuild 5433 BLAKE2B 6fb5e32c417ff83e4d353c1ee39e2a09ed020ce73998aea453c0f10c14340454e0ce04d2956da6c23e0d67e43a25596d8986dd3f8dc762ddcf63917a5cef08b4 SHA512 9b60f4a068d0382d9b5f03dec67af1a546f529a7a9bd54d713c499070bce25742101d9783c157dc325181330b466f61911bab0f91f33ce95c67ce0fbe57d1495
 EBUILD tomcat-10.1.24-r1.ebuild 5433 BLAKE2B 6fb5e32c417ff83e4d353c1ee39e2a09ed020ce73998aea453c0f10c14340454e0ce04d2956da6c23e0d67e43a25596d8986dd3f8dc762ddcf63917a5cef08b4 SHA512 9b60f4a068d0382d9b5f03dec67af1a546f529a7a9bd54d713c499070bce25742101d9783c157dc325181330b466f61911bab0f91f33ce95c67ce0fbe57d1495
-EBUILD tomcat-9.0.87-r3.ebuild 5030 BLAKE2B 518eed7bbfd39fe6616a212d6e1b2b84e1f1603b36c592ed8cb107f8fe4ae3e71f1962c5099b41628b90ab8e7b8af64630bc1bb8d643b90639153b76e2a6c87c SHA512 57e53b9344f6f7d3f20371f106f6ac82a74f9f883b95ef3daa7ceab043bee2cd990c78a9d45561c68eb79a170ea69bace8c4bedd8b9f763dfbecb6701350d1e1
-EBUILD tomcat-9.0.88-r1.ebuild 5018 BLAKE2B 18aa3279abebfcbcfeb8e6c09ea0a36ab61a8041ce1105770739a79646de699089ffe530b6e85e6b07f9c7c007ba921f722dcce3d25a4a8e45bc2a988c32aa6c SHA512 e69a060a97ffeb2aae1428e87630d9ce87bb31681eb6b04d5723a32afda44e21d4996babd4f98bb42e0abe5f0a1851a46b95982d4d75b45dcd605a6acd2f2584
+EBUILD tomcat-9.0.88-r1.ebuild 5017 BLAKE2B ae1262dfd897258a71616cbf732c9ebf609380fbb674e10ae53aef3d71174f0655578be5f2c985367df6ccf0eeb96b8907e0e7f3025b0a4db8f55f899ab33152 SHA512 443117958bc417f019b4e32a300b528a86abd77c32b1abba305ca4940fb159eaa31b80ae4c6862baf827948b7c761ca554e6070a4b495abac00660a0ab8d9eb8
 EBUILD tomcat-9.0.89.ebuild 5018 BLAKE2B 18aa3279abebfcbcfeb8e6c09ea0a36ab61a8041ce1105770739a79646de699089ffe530b6e85e6b07f9c7c007ba921f722dcce3d25a4a8e45bc2a988c32aa6c SHA512 e69a060a97ffeb2aae1428e87630d9ce87bb31681eb6b04d5723a32afda44e21d4996babd4f98bb42e0abe5f0a1851a46b95982d4d75b45dcd605a6acd2f2584
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
deleted file mode 100644
index 85ad9ab64682..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1148,9 +1148,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1210,7 +1210,9 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
-+<!-- we provide jdt jar externally
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+-->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1719,7 +1721,7 @@
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
-           description="Prepare to build web services extras package">
--
-+<!-- we provide jaxrpc
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-       <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -1728,7 +1730,8 @@
-       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
-     </antcall>
--
-+-->
-+<!-- we provide wsdl4j
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
-       <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -1737,11 +1740,13 @@
-       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
-     </antcall>
--
-+-->
-+<!-- ignored above
-     <copy file="${jaxrpc-lib.jar}"
-           tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
-     <copy file="${wsdl4j-lib.jar}"
-           tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
-+-->
-   </target>
- 
-   <target name="extras-webservices"
-@@ -1850,11 +1855,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2020,8 +2026,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       <link href="../elapi"/>
-       <link href="../websocketapi"/>
-       <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
-       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
-       <link href="https://docs.oracle.com/javaee/7/api/"/>
-+-->
-       <packageset dir="${tomcat.dist}/src/java/">
-         <include name="org/**"/>
-         <exclude name="org/apache/el/parser/**"/>
-@@ -2933,6 +2941,7 @@ asf.ldap.username=${release.asfusername}
-           description="Download components necessary to compile" >
- 
-     <!-- Download Commons Daemon -->
-+<!-- not needed
-     <antcall target="downloadgz-2">
-       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -2941,8 +2950,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
-       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${jdt.loc.1}"/>
-       <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -2952,7 +2962,7 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
-       <param name="checksum.value" value="${jdt.checksum.value}"/>
-     </antcall>
--
-+-->
-   </target>
- 
-   <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
deleted file mode 100644
index 9198ff3a1911..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 723be26..3cf7bb7 100644
---- a/build.xml
-+++ b/build.xml
-@@ -112,8 +112,8 @@
- 
-   <!-- Java EE 7 platform requires Java 7+ -->
-   <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
--  <property name="compile.release" value="7"/>
--  <property name="min.java.version" value="7"/>
-+  <property name="compile.release" value="8"/>
-+  <property name="min.java.version" value="8"/>
-   <property name="build.java.version" value="11"/>
- 
-   <!-- Locations to create the JAR artifacts -->
---- a/webapps/docs/tomcat-docs.xsl
-+++ b/webapps/docs/tomcat-docs.xsl
-@@ -39,7 +39,7 @@
-   <xsl:param    name="version"             select="'8.5.x'"/>
-   <xsl:param    name="majorversion"        select="'8'"/>
-   <xsl:param    name="majorminorversion"   select="'8.5'"/>
--  <xsl:param    name="minjavaversion"      select="'7'"/>
-+  <xsl:param    name="minjavaversion"      select="'8'"/>
-   <xsl:param    name="buildjavaversion"    select="'11'"/>
-   <xsl:param    name="antversionrequired"  select="'1.9.10'"/>
-   <xsl:param    name="build-date"          select="'MMM d yyyy'"/>
---- a/modules/jdbc-pool/build.properties.default
-+++ b/modules/jdbc-pool/build.properties.default
-@@ -40,7 +40,7 @@ version.suffix=
- # contexts by the various build scripts.
- base.path=${basedir}/includes
- 
--compile.release=7
-+compile.release=8
- compile.debug=true
- 
- # Do not pass -deprecation (-Xlint:deprecation) flag to javac
diff --git a/www-servers/tomcat/tomcat-9.0.87-r3.ebuild b/www-servers/tomcat/tomcat-9.0.87-r3.ebuild
deleted file mode 100644
index f4a3a79e6455..000000000000
--- a/www-servers/tomcat/tomcat-9.0.87-r3.ebuild
+++ /dev/null
@@ -1,168 +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-${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/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-annotation: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
-		execute.download=false
-		exist=true # skip target="downloadfile-2"
-		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
-		bnd-annotation.jar=$(java-pkg_getjars --build-only 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
-
-	# 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
-}
-
-EANT_BUILD_TARGET="deploy"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	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.88-r1.ebuild b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
index ca10cc20e118..416b71be8c5d 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 ~x86 ~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?