10 files changed, 41 insertions, 42 deletions
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
deleted file mode 100644
index 7d2b2471954a..000000000000
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( dev-java/ant-junit:0 dev-java/ant-junit4:0 dev-java/ant-junitlauncher:0 dev-java/ant-testutil:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Ivy is a free java based dependency manager
-EAPI=8
-HOMEPAGE=https://ant.apache.org/ivy/
-INHERIT=java-pkg-2 java-pkg-simple java-osgi
-IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-PROPERTIES=test_network
-RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( dev-java/ant-junit:0 dev-java/ant-junit4:0 dev-java/ant-junitlauncher:0 dev-java/ant-testutil:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-osgi	c82db640aeccac34f009e90c7bb10a81
-_md5_=b8ffa063f56d10f6081980a097bcb278
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2
new file mode 100644
index 000000000000..a32764c96376
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Ivy is a free java based dependency manager
+EAPI=8
+HOMEPAGE=https://ant.apache.org/ivy/
+INHERIT=java-pkg-2 java-pkg-simple java-osgi
+IUSE=doc source test
+KEYWORDS=amd64 ppc64 x86
+LICENSE=Apache-2.0
+PROPERTIES=test_network
+RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=2
+SRC_URI=https://archive.apache.org/dist/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
+_eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-osgi	c82db640aeccac34f009e90c7bb10a81
+_md5_=98beb35c28526a841061d16f2341e735
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r2
index 0d0941caaf32..a15ff9203f11 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/ant-1.10.14-r3:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
 EAPI=8
 HOMEPAGE=https://github.com/cglib/cglib
@@ -7,9 +7,9 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=examples source test
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14-r3:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9
-_md5_=ce17e92c57e18188a5d7ac54ab915579
+_md5_=1c8f923134b504c26e7801534c9b2d04
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r6
index 420018b4923b..03b2d74bd073 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r6
@@ -1,15 +1,14 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Interfaces useful for applications which support RELAX Core
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.xml.gr.jp/relax/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9
-_md5_=8da8f72cea0d9287f9b995c70a2dae46
+_md5_=c88f04e67d3e31090dc7fc8ebc06296f
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index 8a925bfea836..d525f04cc05d 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc
-_md5_=b140cbe80d1d147d604ba3d6832d278c
+_md5_=78dde6709d3556a3db98f2282c032fd9
diff --git a/metadata/md5-cache/dev-java/jtidy-938 b/metadata/md5-cache/dev-java/jtidy-1.0-r2
index a1f0e0a02158..48902826e2ed 100644
--- a/metadata/md5-cache/dev-java/jtidy-938
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r2
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=a Java port of HTML Tidy, a HTML syntax checker and pretty printer
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/jtidy/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=HTML-Tidy W3C
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=9
-SRC_URI=https://master.dl.sourceforge.net/project/jtidy/JTidy/r938/jtidy-r938-sources.zip
+RDEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9
-_md5_=00bc48da3bf7a43cfef58c7852245824
+_md5_=15e497c5f38b92c4afb55f0213689bf6
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0 b/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
index aa7df2d8f201..0c7bb223f702 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-core:0 dev-java/commons-logging:0 dev-java/xml-commons-external:1.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/ant-1.10.14-r3:0 dev-java/commons-logging:0 dev-java/xml-commons-external:1.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=The class loader framework of the Plexus project
 EAPI=8
 HOMEPAGE=https://codehaus-plexus.github.io/plexus-classworlds/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-2.7.0.tar.gz
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9
-_md5_=4d00834709537c0bbc008fb002d40493
+_md5_=0d9581530952f02eb429ea49c389ae95
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14-r1
index a4681919520c..1c7d94554053 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/emma:0 dev-java/jakarta-xml-soap-api:1 dev-java/jmh-core:0 dev-java/hamcrest-core:1.3 dev-java/snakeyaml:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/ant-1.10.14-r3:0[junit] dev-java/emma:0 dev-java/jakarta-xml-soap-api:1 dev-java/jmh-core:0 dev-java/hamcrest-core:1.3 dev-java/snakeyaml:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=An open-source implementation of JavaScript written in Java
 EAPI=8
 HOMEPAGE=https://github.com/mozilla/rhino
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
 _eclasses_=java-utils-2	b346c3901e71ba37137bae0b25b00221	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9
-_md5_=e22c22e09284defb9a49b15e471af42c
+_md5_=6374157fd608e69ee18c7222cd238865
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 90344441a159..8546e5dd0ce1 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4766,7 +4766,7 @@ dev-java/animal-sniffer-annotations 1.15-r1: Java annotations for marking method
 dev-java/ant 1.10.14-r3: Java-based build tool similar to 'make' that uses XML configuration files
 dev-java/ant-contrib 1.0_beta6_pre20201123-r1: Ant-contrib tasks for Apache Ant
 dev-java/ant-core 1.10.14: Compatibility link to ant-core for >=dev-java/ant-1.10.14
-dev-java/ant-ivy 2.5.0-r1: Ivy is a free java based dependency manager
+dev-java/ant-ivy 2.5.0-r2: Ivy is a free java based dependency manager
 dev-java/antlr 2.7.7-r9 3.2-r2 3.5.3 4.9.3: A parser generator for many languages
 dev-java/antlr-runtime 3.5.3 4.9.3: ANTLR 4 Runtime
 dev-java/antlr-tool 3.5.3-r1 4.9.3-r2: The ANTLR 4 grammar compiler
@@ -4802,7 +4802,7 @@ dev-java/cache2k-core 0.23.1: light weight and high performance Java caching lib
 dev-java/caffeine 2.6.2-r1: A high performance caching library
 dev-java/cal10n 0.8.1: java library for writing localized messages using resource bundle
 dev-java/cdi-api 4.0.1-r2: APIs for CDI (Contexts and Dependency Injection for Java)
-dev-java/cglib 3.3.0-r1: cglib is a powerful, high performance and quality Code Generation Library
+dev-java/cglib 3.3.0-r2: cglib is a powerful, high performance and quality Code Generation Library
 dev-java/checker-framework-qual 3.42.0: Annotations for type-checking by the Checker Framework
 dev-java/commons-beanutils 1.9.4-r2: Provides easy-to-use wrappers around Reflection and Introspection APIs
 dev-java/commons-cli 1.5.0: A Java library for working with the command line arguments and options
@@ -4870,7 +4870,7 @@ dev-java/icedtea-web 1.8.8-r1: FOSS Java browser plugin and Web Start implementa
 dev-java/icu4j 74.2-r1: A set of Java libraries providing Unicode and Globalization support
 dev-java/identicon 1.0: Visual representation of a hash value
 dev-java/injection-api 2.0.1: Jakarta Dependency Injection
-dev-java/iso-relax 20050331-r5: Interfaces useful for applications which support RELAX Core
+dev-java/iso-relax 20050331-r6: Interfaces useful for applications which support RELAX Core
 dev-java/istack-commons-runtime 3.0.12 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
@@ -4976,7 +4976,7 @@ dev-java/jsr305 3.0.2-r1: Annotations for Software Defect Detection in Java
 dev-java/jstl 1.2.7: Jakarta Standard Tag Library API
 dev-java/jstl-api 1.2.7: Jakarta Standard Tag Library API
 dev-java/jtds 1.3.1-r1: jTDS - SQL Server and Sybase JDBC driver
-dev-java/jtidy 1.0-r1 938: a Java port of HTML Tidy, a HTML syntax checker and pretty printer
+dev-java/jtidy 1.0-r1 1.0-r2: a Java port of HTML Tidy, a HTML syntax checker and pretty printer
 dev-java/jtwig-core 5.87.0: Jtwig Reflection Library
 dev-java/jtwig-reflection 5.87.0: Jtwig Reflection Library
 dev-java/jul-to-slf4j 2.0.3: JUL to SLF4J bridge
@@ -5025,7 +5025,7 @@ dev-java/owasp-java-encoder 1.2.3: OWASP Java Encoder
 dev-java/parboiled 1.4.1: Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful
 dev-java/pdfbox 2.0.27: Java library and utilities for working with PDF documents
 dev-java/picocli 4.6.3-r1: Java command line parser with both an annotations API and a programmatic API
-dev-java/plexus-classworlds 2.7.0: The class loader framework of the Plexus project
+dev-java/plexus-classworlds 2.7.0-r1: The class loader framework of the Plexus project
 dev-java/poi 5.2.3: Maven build of Apache POI for Sonar checks
 dev-java/protobuf-java 3.23.0 3.23.3 3.25.1 3.25.2 3.25.3 3.26.0: Core Protocol Buffers library
 dev-java/qdox 1.12.1-r3 2.0.1: Parser for extracting class/interface/method definitions
@@ -5033,7 +5033,7 @@ dev-java/randomized-runner 2.8.0: JUnit test runner and plugins for running JUni
 dev-java/reflections 0.9.12-r6: Reflections - a Java runtime metadata analysis
 dev-java/relaxng-datatype 20020414: Interface between RELAX NG validators and datatype libraries
 dev-java/reload4j 1.2.22: Reload4j revives EOLed log4j 1.x
-dev-java/rhino 1.7.14: An open-source implementation of JavaScript written in Java
+dev-java/rhino 1.7.14-r1: 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
 dev-java/saslprep 1.1-r1: SASLprep: Stringprep Profile for User Names and Passwords
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e9d7f7ab3032..654bea7afb8e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Apr 2024 09:49:40 +0000
+Mon, 15 Apr 2024 10:34:24 +0000