2023-11-28 19:32:01 UTC

6 files changed, 6 insertions, 54 deletions

diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.15 b/metadata/md5-cache/www-servers/tomcat-10.1.15
deleted file mode 100644
index a610a29c41c8..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.1.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.15:10.1.15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-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-11:* 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-core-1.8.2: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.15/src/apache-tomcat-10.1.15-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.1/biz.aQute.bnd-6.4.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.15/src/apache-tomcat-10.1.15-src.tar.gz.asc )
-_eclasses_=java-utils-2	c04e82b700f977924b211c7cdbc2f096	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=85740998a1ddcc36caab3425bae2e0da
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.16 b/metadata/md5-cache/www-servers/tomcat-10.1.16
index dc0fbeee8b1a..6f41a0160aa4 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.16
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.16
@@ -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.16/src/apache-tomcat-10.1.16-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.16/src/apache-tomcat-10.1.16-src.tar.gz.asc )
 _eclasses_=java-utils-2	c04e82b700f977924b211c7cdbc2f096	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=b49666b79fa3d7ce15eecb36da7f6282
+_md5_=989bbc78ac61503e83cf00bbc3563475
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.95-r1 b/metadata/md5-cache/www-servers/tomcat-8.5.95-r1
deleted file mode 100644
index a1becb14c655..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.95-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.95:8.5.95 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-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-1.8:* 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-core-1.8.2: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.95/src/apache-tomcat-8.5.95-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.95/src/apache-tomcat-8.5.95-src.tar.gz.asc )
-_eclasses_=java-utils-2	c04e82b700f977924b211c7cdbc2f096	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=46eb31a00a48a548ca4dd3f75f961600
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.96 b/metadata/md5-cache/www-servers/tomcat-8.5.96
index e80261184e91..36c4f4832a47 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.96
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.96
@@ -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.96/src/apache-tomcat-8.5.96-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.96/src/apache-tomcat-8.5.96-src.tar.gz.asc )
 _eclasses_=java-utils-2	c04e82b700f977924b211c7cdbc2f096	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=8415145d180bbef7018c13f53b2c51dd
+_md5_=46eb31a00a48a548ca4dd3f75f961600
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.82 b/metadata/md5-cache/www-servers/tomcat-9.0.82
deleted file mode 100644
index a3208e5bbacb..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.82
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.82:9.0.82 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-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-1.8:* 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-core-1.8.2: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.82/src/apache-tomcat-9.0.82-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.1/biz.aQute.bnd-6.4.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.82/src/apache-tomcat-9.0.82-src.tar.gz.asc )
-_eclasses_=java-utils-2	c04e82b700f977924b211c7cdbc2f096	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=a4483d61eaa6e9a2ac9557d72b33c201
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.83 b/metadata/md5-cache/www-servers/tomcat-9.0.83
index 5dc432c2af62..9f5030a87d65 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.83
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.83
@@ -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.83/src/apache-tomcat-9.0.83-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.83/src/apache-tomcat-9.0.83-src.tar.gz.asc )
 _eclasses_=java-utils-2	c04e82b700f977924b211c7cdbc2f096	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=b39f3f0b4ddafbafd451bd7fcdb4bbb0
+_md5_=7228f1439acb352c2896b38b7a60908e