2020-02-12 09:09:28 UTC

4 files changed, 12 insertions, 12 deletions

diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.96 b/metadata/md5-cache/www-servers/tomcat-7.0.96
index 3760c1d5f14a..daf674fd114e 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.96
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.96
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.96 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.96 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.96/src/apache-tomcat-7.0.96-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=004bc30387ab3ead2a4f916bd7e29be0
+_md5_=dc693487aa9928467bded2ec2bbb56ba
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.99 b/metadata/md5-cache/www-servers/tomcat-7.0.99
index aec99035ec7d..e808d0768009 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.99
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.99
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.99 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.99 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.99/src/apache-tomcat-7.0.99-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=bb79ef7852b1c0cb4a3f150643619072
+_md5_=5f61396f538255bced4da939841b95e5
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.47 b/metadata/md5-cache/www-servers/tomcat-8.5.47
index adbf2413171d..eef2bf8117f5 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.47
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.47
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8 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-0.3.0-r2
+DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.47 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8 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-0.3.0-r2
 DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.47 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.47/src/apache-tomcat-8.5.47-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=fd23d4fe75cbca20f11e32076ace22f5
+_md5_=33e1576a2b05941134e9c65a175556c4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.27 b/metadata/md5-cache/www-servers/tomcat-9.0.27
index 6d5f95382291..8727f5f244ca 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.27
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.27
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.13 dev-java/glassfish-xmlrpc-api:0 dev-java/tomcat-servlet-api:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-11 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-0.3.0-r2
+DEPEND=dev-java/eclipse-ecj:4.13 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.27 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-11 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-0.3.0-r2
 DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.13 dev-java/glassfish-xmlrpc-api:0 dev-java/tomcat-servlet-api:4.0 dev-java/wsdl4j:0 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.13 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.27 dev-java/wsdl4j:0 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.27/src/apache-tomcat-9.0.27-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/4.1.0/biz.aQute.bnd-4.1.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.1.0/biz.aQute.bndlib-4.1.0.jar
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=5dc979da2717f6921358b448dec42f7e
+_md5_=7b721e61b69b0db927db368a9d782243