2024-05-22 09:49:06 UTC

4 files changed, 6 insertions, 38 deletions

diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.20-r2 b/metadata/md5-cache/www-servers/tomcat-10.1.20-r2
deleted file mode 100644
index 5963250d6c71..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.1.20-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.20:10.1.20 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.27 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3: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 ) >=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/bnd-annotation:0 dev-java/eclipse-ecj:4.27 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2: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.20/src/apache-tomcat-10.1.20-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.20/src/apache-tomcat-10.1.20-src.tar.gz.asc )
-_eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=1c239b6d1a93edbb8f01990be2907144
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.23 b/metadata/md5-cache/www-servers/tomcat-10.1.23-r1
index f882b4db4ed0..a0686ae0d47b 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.23
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.23-r1
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.23:10.1.23 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.27 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3: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 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
+DEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3: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 ) >=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/
@@ -8,9 +8,9 @@ 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/bnd-annotation:0 dev-java/eclipse-ecj:4.27 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2: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 )
+RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2: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.23/src/apache-tomcat-10.1.23-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.23/src/apache-tomcat-10.1.23-src.tar.gz.asc )
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=1c239b6d1a93edbb8f01990be2907144
+_md5_=2c366114f46b9d7fd6e2caaedd1a8260
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.24 b/metadata/md5-cache/www-servers/tomcat-10.1.24-r1
index fb35d7d68220..6fece6a7bc91 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.24
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.24-r1
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.24:10.1.24 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.27 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3: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 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
+DEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-1.10.14-r3: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 ) >=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/
@@ -8,9 +8,9 @@ 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/bnd-annotation:0 dev-java/eclipse-ecj:4.27 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2: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 )
+RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2: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.24/src/apache-tomcat-10.1.24-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.24/src/apache-tomcat-10.1.24-src.tar.gz.asc )
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=1c239b6d1a93edbb8f01990be2907144
+_md5_=2c366114f46b9d7fd6e2caaedd1a8260
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.100 b/metadata/md5-cache/www-servers/tomcat-8.5.100
deleted file mode 100644
index 16c793cdd7f8..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.100:8.5.100 ) 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-1.10.14-r3:0 >=virtual/jdk-11:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-1.10.14-r3:0[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-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.100/src/apache-tomcat-8.5.100-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.asc )
-_eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=2e7c1ec007a2073361b76c226c4fb2b4