gentoo auto-resync : 11:04:2024 - 12:32:48

54 files changed, 88 insertions, 57 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 51de801ed20b..83ad35b46d42 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/ant-antlr-1.10.9 b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
index a5972e094899..56439580f6bc 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=95b25a81b2078596185b8c633916297c
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
index bd430a0546f9..6acb9ad513dc 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=38e89e04094fd723f33e230a67080265
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1
index 0bd013d00253..ef724edb650f 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?] >=dev-java/java-config-2.2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=aaeb7a056c47e4a8f4243b83dbeefa27
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index cf1c0cabda36..05f78428ba1e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6927de0050741d27d434190f09d25282
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
index a79650883e0d..64bf2cee09f9 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ece355386a034501aefc3abbf63f290c
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
index 7eb87d8b6ff9..9583f6c3f555 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b1df8370de1c2e4446bbc1a857090021
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
index 176a4f68ba59..76288c9717ed 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9010b1d5007987008f8989150f4f3459
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
index d1f858ad6973..4de221cf7afe 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=525c909435e802693faa9089623d681a
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
index 67ec752a8f92..5bb745c79eb1 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c17cca848a2209269372949af9e28e04
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
index 4bf3285db8f8..50efea32f872 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f9777c11b201ce8e54fdb4c143832bfd
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.9 b/metadata/md5-cache/dev-java/ant-jai-1.10.9
index 36dafc363647..83fd2bf44000 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jai-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=42e8a3bbc17b75be224e72baf75747a2
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
index b23264c525cd..88852675dc94 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0d0fe5000a6697f59ae1a22ee8899d2d
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
index 274de010d449..b7710e3b48a4 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f3b9655aa578743dcf51d9369738a1e4
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.9 b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
index bfdefa701758..1fb750632e4a 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9d7fd9f097b82993ec1201c2aac20158
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.9 b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
index 2a143c1040ea..aa350e5a1106 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ddcbb7ce88f3db70836c837727ec9c66
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.9 b/metadata/md5-cache/dev-java/ant-junit-1.10.9
index 12338c886ae6..f5c96ac91b9f 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6367f66edd8a2057d214a119368067a2
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.9 b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
index 799bc1669062..9689c5d2c2b3 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6967158f03a23bbcfe494ed4c782ad81
diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
index b8cbace4537a..148981ad44e9 100644
--- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6a9589f1600cbdca6a8c270f017a4a35
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.9 b/metadata/md5-cache/dev-java/ant-swing-1.10.9
index 91af0226baae..7689dc780488 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-swing-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=3be3c9a424df111d8108d7ea3aac88e9
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.9 b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
index 4ac7acc13c58..1feb6f7c945a 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=fe7b077b1b09f4e16b940f01228f6e8d
diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.9 b/metadata/md5-cache/dev-java/ant-xz-1.10.9
index 9eac6c0c8043..0e3b9740e8f6 100644
--- a/metadata/md5-cache/dev-java/ant-xz-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-xz-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks	e09b5b633d67069638691986e11da782	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=80b30c32b257df29fde82bdf94428c6f
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
index 0016b83f114f..cb5ebeaa496e 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/c3p0/c3p0-src/c3p0-0.9.5.5/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6af13cc902a709bd62f79cdde4d1843f
diff --git a/metadata/md5-cache/dev-java/caffeine-2.6.2 b/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
index 0d836fefa1fa..9c7b5c4118c4 100644
--- a/metadata/md5-cache/dev-java/caffeine-2.6.2
+++ b/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jsr305:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=dev-java/jsr305:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=A high performance caching library
 EAPI=8
 HOMEPAGE=https://github.com/ben-manes/caffeine
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/2.6.2/caffeine-2.6.2-sources.jar
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=a12b688911fc3f2c61917dace3749b40
+_md5_=5fd662d8bae432ce177ccc3477755d61
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r3 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r3
index 1d7d24a15283..74708e56df4b 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r3
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://archive.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c5f158cae2dcdfa811f49af0509fc66d
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
index d187f0075752..d1db0a65b1b7 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r2
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
index d9be51e049cc..50113ead20f6 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 >=dev-jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4119d44de9ef5503b26406249cd4cc26
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r4 b/metadata/md5-cache/dev-java/fec-1.0.4-r4
index a72729d3d961..76ba51a1a976 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r4
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=367ae75dc05c4448025f00e17507b758
diff --git a/metadata/md5-cache/dev-java/gin-2.1.2-r1 b/metadata/md5-cache/dev-java/gin-2.1.2-r1
index 09539a0a6fa1..3c4f1c84a13c 100644
--- a/metadata/md5-cache/dev-java/gin-2.1.2-r1
+++ b/metadata/md5-cache/dev-java/gin-2.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java
 RESTRICT=mirror
 SLOT=2.1
 SRC_URI=https://github.com/gwtplus/google-gin/archive/2.1.2.tar.gz -> gin-2.1.2.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=2411d184bca3209b2a42c682775c8ad2
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
index 451d42327bd5..f2b425293a9d 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.2.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=8262c20d8c547d826d3620a0c5929896
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r3 b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
index 1acdaf1b4051..84f47420fcb0 100644
--- a/metadata/md5-cache/dev-java/gwt-2.9.0-r3
+++ b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:
 RESTRICT=mirror test
 SLOT=2.8
 SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ff32efc4c783593995d5cb71417aa35b
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
index 188ea5efddf3..f0019cc5a056 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0289e85479573729c116bd0e84ef1649
diff --git a/metadata/md5-cache/dev-java/javacc-4.1 b/metadata/md5-cache/dev-java/javacc-4.1
index 2e3592480476..e73e120ab506 100644
--- a/metadata/md5-cache/dev-java/javacc-4.1
+++ b/metadata/md5-cache/dev-java/javacc-4.1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/javacc/javacc/archive/release_41.tar.gz -> javacc-4.1.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0cde783bdf48de661c2dc1cc671125cd
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r5 b/metadata/md5-cache/dev-java/javacc-5.0-r5
index ce7210143784..4c7381eea591 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r5
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r5
@@ -11,5 +11,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=df67519aba806bc4964b5d62fdd82825
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.13 b/metadata/md5-cache/dev-java/javacc-7.0.13
index 5bf625c35400..5baff7cad0d0 100644
--- a/metadata/md5-cache/dev-java/javacc-7.0.13
+++ b/metadata/md5-cache/dev-java/javacc-7.0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=7.0.13
 SRC_URI=https://github.com/javacc/javacc/archive/javacc-7.0.13.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f05f0ffa9f2e59d604ff5ec96a1d6398
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.4 b/metadata/md5-cache/dev-java/javacc-7.0.4
index 132dfb8df5c7..fe92ba511861 100644
--- a/metadata/md5-cache/dev-java/javacc-7.0.4
+++ b/metadata/md5-cache/dev-java/javacc-7.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=7.0.4
 SRC_URI=https://github.com/javacc/javacc/archive/7.0.4.tar.gz -> javacc-7.0.4.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9f75708c4d09eb6234537f085b9106eb
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 02e64ec96b61..c7aa50b3dfc9 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b7861a015fa8d672bd4aa7c7aa5ac1b6
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
index 8a67a3b0b329..c79b41301f4c 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=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-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=affaa6213111dd69d75e3f3d70a021a5
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
index 2b44f6c19524..847c12144534 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=test
 SLOT=1.2
 SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
index 0c14d4332389..4cca2a02cd13 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0 b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
index b0cfd66e6ed1..6a56858ea932 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=dev-java/c3p0:0 <dev-java/protobuf-java-3.26.0:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=JDBC Type 4 driver for MySQL
 EAPI=8
 HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2-with-MySQL-FLOSS-exception
-RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/c3p0:0 <dev-java/protobuf-java-3.26.0:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.1.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/2.47.0/oci-java-sdk-common-2.47.0.jar
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=39e40349980c93b03c7fa35c0f588109
+_md5_=54e6974a1fca6dec1821adefbf064030
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0 b/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0
new file mode 100644
index 000000000000..ff995c52f645
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/c3p0:0 >=dev-java/protobuf-java-3.25:0 <dev-java/protobuf-java-3.26:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* test? ( dev-java/junit:5 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JDBC Type 4 driver for MySQL
+EAPI=8
+HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2-with-MySQL-FLOSS-exception
+RDEPEND=dev-java/c3p0:0 >=dev-java/protobuf-java-3.25:0 <dev-java/protobuf-java-3.26: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=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.3.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/3.29.0/oci-java-sdk-common-3.29.0.jar
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
+_md5_=da0af3efe9e1e799f0e13200ba7c6ead
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
index 795581f70564..8fb531c45a5e 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
@@ -10,5 +10,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index 0848f0f6cfc9..c77f601b98cb 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -11,5 +11,5 @@ 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=0
 SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 6c50e9691e53..77323e179685 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -1,14 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test unpack
 DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Simple framework to write repeatable tests
-EAPI=7
-HOMEPAGE=http://www.junit.org/
+EAPI=8
+HOMEPAGE=https://junit.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
+SRC_URI=mirror://sourceforge/project/junit/junit/3.8.2/junit3.8.2.zip
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=75a4665c456b795a30afb4c8f0ef100a
+_md5_=dd7ae482483b1dcffbf3304e0f10503e
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2-r1 b/metadata/md5-cache/dev-java/junit-4.13.2-r1
index 8b9c0dab8906..d695409d3ac2 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2-r1
+++ b/metadata/md5-cache/dev-java/junit-4.13.2-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/r4.13.2.tar.gz -> junit-4.13.2.tar.gz
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=a700bb2a62cd4b23fa252ccf1849eaf5
+_md5_=7845054d85def1af4d2bc76cdcbee850
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2_p20240222 b/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
new file mode 100644
index 000000000000..e84f920c393b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/hamcrest-core:1.3 >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Simple framework to write repeatable tests
+EAPI=8
+HOMEPAGE=https://junit.org/junit4/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=EPL-1.0
+RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=https://github.com/junit-team/junit4/archive/28fa2cae48b365c949935b28967ffb3f388e77ef.tar.gz -> junit-4.13.2_p20240222.tar.gz
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
+_md5_=4bc3e7a7908b83bf75da912caea787d1
diff --git a/metadata/md5-cache/dev-java/junit-5.9.2 b/metadata/md5-cache/dev-java/junit-5.9.2
index 4f9b817a2cfd..bb211cae0b49 100644
--- a/metadata/md5-cache/dev-java/junit-5.9.2
+++ b/metadata/md5-cache/dev-java/junit-5.9.2
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/apiguardian-api:0 dev-java/opentest4j:0 dev
 SLOT=5
 SRC_URI=https://github.com/junit-team/junit5/archive/r5.9.2.tar.gz -> junit-5.9.2.tar.gz
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=14aab5aef96170ff434eddf8b14d4951
+_md5_=8dc83a1e2201ae63e9034377af991d9c
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
index b9e4d23bb8e9..aa738c8d6eae 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r3
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=590e0bfc50c22320d0caef8faa97ffbd
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index 5db4fc138718..d20d6a506e95 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.0
 RDEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=492c373b39e55881c0c316c96e9a9551
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r3 b/metadata/md5-cache/dev-java/swt-3.7.2-r3
index 7173b56b0e8e..2775ed598d6e 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=3.7
 SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=da01f369ec32ff0e9e1a3bf3b58fdd50
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index 11694d787978..4173f7684399 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=4.10
 SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-ant-2	695635244f02d8e4820279a6511ccc18	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9357b69c0bdc450cae3296a3992da441
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
index 275e2213fb9d..92ac60ed553f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d65353f5132fb112929415131a525e35
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
index 3f7bf1b7e28d..867598cfa4b8 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c997da50407e1c5b051225df8e317c3c