gentoo auto-resync : 11:10:2022 - 13:38:21

9 files changed, 75 insertions, 20 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 12aaea325085..545f65727d5b 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r3 b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
index fbc51d8ef931..f4b267c722dc 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r3
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
@@ -12,4 +12,4 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-jav
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5-sources.jar
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=23d19414f525660aebba05316769dd8e
+_md5_=607728143a0bee912be7ca89cfb83ed5
diff --git a/metadata/md5-cache/dev-java/objenesis-3.2 b/metadata/md5-cache/dev-java/objenesis-3.2
deleted file mode 100644
index 0e2e80e62bc6..000000000000
--- a/metadata/md5-cache/dev-java/objenesis-3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/objenesis-test-3.2:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A library for instantiating Java objects
-EAPI=7
-HOMEPAGE=http://objenesis.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=06fba41631ebab0c728e0e0661211a34
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.0
index d1da9b03cc0c..7eaf9d1f538f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 6.0/JSP API 3.1/EL API 5.0 implementation
+DESCRIPTION=Tomcat's EL API 5.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
-IUSE=source
+IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=6.0
+SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.0/src/apache-tomcat-10.1.0-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=25f3ecd8bd80e13186d4d73231195fe5
+_md5_=9c248298974cc2dc8ec5cf67a864c8ee
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68
new file mode 100644
index 000000000000..e60f6677539a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 5.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=f91a2103a26823fe3367682cd93abed3
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.0 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.0
new file mode 100644
index 000000000000..caf2d6e8732c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.0:5.0 ~dev-java/tomcat-servlet-api-10.1.0:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.0:5.0 ~dev-java/tomcat-servlet-api-10.1.0:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.0/src/apache-tomcat-10.1.0-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=93cde86728840cc9bd9cc1703697e82f
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68
new file mode 100644
index 000000000000..eb086250495a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.3
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=7e81baa6b59ff2fc7d5b86e623d2e23b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0-r1
new file mode 100644
index 000000000000..bc8f673b5b82
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.0:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.0:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=6.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.0/src/apache-tomcat-10.1.0-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=f029f86d22e146e8b7122d39e14bc37f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68
new file mode 100644
index 000000000000..6c1816aec34a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=bb6afdb0612e13409a0621cd1bcef648