7 files changed, 6 insertions, 54 deletions
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 8ec7e9a9054c..45313caa2ad6 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.18-r1 b/metadata/md5-cache/www-servers/tomcat-10.1.18-r1
deleted file mode 100644
index acaadd9f6c1e..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.1.18-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.18:10.1.18 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-17:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=10.1
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.18/src/apache-tomcat-10.1.18-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.18/src/apache-tomcat-10.1.18-src.tar.gz.asc )
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=5316e5e374d82bea7173d802b2664621
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.19-r1 b/metadata/md5-cache/www-servers/tomcat-10.1.19-r1
index 214d268f873e..4c0e8d565e30 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.19-r1
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.19-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.19/src/apache-tomcat-10.1.19-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.19/src/apache-tomcat-10.1.19-src.tar.gz.asc )
 _eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=c23b3fd1e9c90c8ebe33df84b21e5581
+_md5_=b45a2f5e63d4c4bb3f65fa773740502f
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.98-r1 b/metadata/md5-cache/www-servers/tomcat-8.5.98-r1
deleted file mode 100644
index 02efb5bed758..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.98-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.98:8.5.98 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.98/src/apache-tomcat-8.5.98-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.98/src/apache-tomcat-8.5.98-src.tar.gz.asc )
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=419919809a7dd43b2575adb76e00d690
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.99-r1 b/metadata/md5-cache/www-servers/tomcat-8.5.99-r1
index 773756231b2d..4e0467a9ac6d 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.99-r1
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.99-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.99/src/apache-tomcat-8.5.99-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.99/src/apache-tomcat-8.5.99-src.tar.gz.asc )
 _eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=f08dba2fad72eb3a19a0b48b66100c9c
+_md5_=98276f05eca481a1283c962fa37eb900
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.85-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.85-r1
deleted file mode 100644
index f9dbdd3d0923..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.85-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.85:9.0.85 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-17:* test? ( dev-java/ant-junit dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
-IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.85/src/apache-tomcat-9.0.85-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.85/src/apache-tomcat-9.0.85-src.tar.gz.asc )
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=bbc33aec5c0bce539d7cb997cb0fa60c
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.86-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.86-r1
index 2712d6350e75..271528c443c0 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.86-r1
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.86-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.86/src/apache-tomcat-9.0.86-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.86/src/apache-tomcat-9.0.86-src.tar.gz.asc )
 _eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=ca0076efe75e1609e3f93252015d157c
+_md5_=99b4a7fa933ba6d38de6e145ca823df9