2023-02-05 10:02:07 UTC

8 files changed, 8 insertions, 77 deletions

diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
deleted file mode 100644
index d81a98608915..000000000000
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annotation-versioning:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* dev-java/osgi-annotation-versioning:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Generic WebDAV Library
-EAPI=7
-HOMEPAGE=https://jackrabbit.apache.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annotation-versioning:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/jackrabbit/2.21.7/jackrabbit-2.21.7-src.zip
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5
-_md5_=4369d49a60ad185c8d0ddf2c0b6993df
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2
index 111d8b3fc9d4..ed503adc0e1f 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.8 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=virtual/jdk:1.8 dev-java/tomcat-servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=The JavaHelp system online help system
 EAPI=8
 HOMEPAGE=https://javaee.github.io/javahelp/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-ant-2
 IUSE=examples source
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.4 dev-java/tomcat-servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
 _eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0
-_md5_=7f4094b8588d34c5b84a29b688f91d16
+_md5_=4f1b469f4907b26166c31faf1da1151c
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
deleted file mode 100644
index 7bb736b2a22c..000000000000
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Resin Servlet API 2.4/JSP API 2.0 implementation
-EAPI=7
-HOMEPAGE=http://www.caucho.com/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.4
-SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0
-_md5_=65d5b79e953b706a291d61e12571b93f
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
deleted file mode 100644
index 2495d754c971..000000000000
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Resin Servlet API 3.0/JSP API 2.1 implementation
-EAPI=8
-HOMEPAGE=https://caucho.com
-INHERIT=java-pkg-2 java-ant-2
-IUSE=source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=https://caucho.com/download/resin-4.0.46-src.tar.gz
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0
-_md5_=13dffd9c17ccbe2c79962cdaac838432
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.4-r1 b/metadata/md5-cache/java-virtuals/servlet-api-2.4-r1
deleted file mode 100644
index c31693be9689..000000000000
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-java/java-config
-DESCRIPTION=Virtual for servlet api
-EAPI=8
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=340
-INHERIT=java-virtuals-2
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=public-domain
-RDEPEND=|| ( dev-java/tomcat-servlet-api:2.4 dev-java/resin-servlet-api:2.4 ) dev-java/java-config
-SLOT=2.4
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-virtuals-2	80385d4bf7cd873a5de3785354ead6c4
-_md5_=8ef2b1266b1e5f942b0bf5351727c0df
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.1-r2 b/metadata/md5-cache/java-virtuals/servlet-api-3.1-r2
deleted file mode 100644
index 239962202eeb..000000000000
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-java/java-config
-DESCRIPTION=Virtual for servlet api
-EAPI=8
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=340
-INHERIT=java-virtuals-2
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-RDEPEND=|| ( dev-java/tomcat-servlet-api:3.1 dev-java/resin-servlet-api:3.1 ) dev-java/java-config
-SLOT=3.1
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-virtuals-2	80385d4bf7cd873a5de3785354ead6c4
-_md5_=8bebfcc8637f0dc8bdcada8b87ec5ce3
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 16d208842c1a..e02a7e709c0d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4996,7 +4996,7 @@ dev-java/iso-relax 20050331-r5: Interfaces useful for applications which support
 dev-java/istack-commons-runtime 4.1.1-r1: istack common utility code
 dev-java/j2objc-annotations 2.8: Annotations for the J2ObjC Java to Objective-C translator
 dev-java/jackcess 4.0.0: A pure Java library for reading from and writing to MS Access databases
-dev-java/jackrabbit-webdav 2.10.1-r3 2.21.7-r1: Generic WebDAV Library
+dev-java/jackrabbit-webdav 2.10.1-r3: Fully conforming implementation of the JRC API (specified in JSR 170 and 283)
 dev-java/jackson-annotations 2.13.4: Core annotations used for value types, used by Jackson data binding package.
 dev-java/jackson-core 2.13.4: Core Jackson processing abstractions (Streaming API), implementation for JSON
 dev-java/jackson-databind 2.13.4.1: General data-binding functionality for Jackson: works on core streaming API
@@ -5030,7 +5030,7 @@ dev-java/java-getopt 1.0.14-r1: Java command line option parser
 dev-java/java-service-wrapper 3.5.50: A wrapper that makes it possible to install a Java Application as daemon
 dev-java/javacc 5.0-r4: Java Compiler Compiler - The Java Parser Generator
 dev-java/javacup 0.11b_p20151001-r1: CUP Parser Generator for Java
-dev-java/javahelp 2.0.05_p20170719-r1: The JavaHelp system online help system
+dev-java/javahelp 2.0.05_p20170719-r2: The JavaHelp system online help system
 dev-java/javassist 3.29.2: A class library for editing bytecodes in Java.
 dev-java/javatoolkit 0.6.7: Collection of Gentoo-specific tools for Java
 dev-java/javax-inject 1-r4: Dependency injection for Java (JSR-330)
@@ -5148,7 +5148,7 @@ dev-java/rat 0.13: Apache Rat is a release audit tool, focused on licenses
 dev-java/reflections 0.9.12-r4: Reflections - a Java runtime metadata analysis
 dev-java/relaxng-datatype 1.0-r3 20020414: Interface between RELAX NG validators and datatype libraries
 dev-java/reload4j 1.2.22: Reload4j revives EOLed log4j 1.x
-dev-java/resin-servlet-api 3.0.25-r1 4.0.27-r2 4.0.46-r1: Resin Servlet API 3.0/JSP API 2.1 implementation
+dev-java/resin-servlet-api 4.0.27-r2: Resin Servlet API 3.0/JSP API 2.1 implementation
 dev-java/rhino 1.7.14: An open-source implementation of JavaScript written in Java
 dev-java/rome 0.9-r4: Java framework for RSS and Atom feeds
 dev-java/rxtx 2.2_pre2-r2: Native library providing serial and parallel communication for Java
@@ -12068,7 +12068,7 @@ gui-wm/gamescope 3.11.51: Efficient micro-compositor for running games
 gui-wm/hikari 2.3.3: Wayland compositor inspired by CWM
 gui-wm/sway 1.7 1.7-r1 1.7-r2 1.8-r1 9999: i3-compatible Wayland window manager
 gui-wm/wayfire 0.7.3-r3 9999: compiz like 3D wayland compositor
-java-virtuals/servlet-api 2.4-r1 3.0-r3 3.1-r2: Virtual for servlet api
+java-virtuals/servlet-api 3.0-r3: Virtual for servlet api
 kde-apps/akonadi 22.08.3 22.12.2: Storage service for PIM data and libraries for PIM apps
 kde-apps/akonadi-calendar 22.08.3 22.08.3-r1 22.12.2: Library for akonadi calendar integration
 kde-apps/akonadi-contacts 22.08.3 22.12.2: Library for akonadi contact integration
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c906fb3d9cba..b14e72b2e2bf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Feb 2023 09:46:58 +0000
+Sun, 05 Feb 2023 10:02:07 +0000