2023-10-01 07:33:26 UTC

117 files changed, 117 insertions, 117 deletions

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 e25f237ab9a5..28b0c56e8ff3 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 56bc048949a6..0cfc1e395f28 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _md5_=38e89e04094fd723f33e230a67080265
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
index 1b049bc866be..ec40efe0ba1e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _md5_=17ef357fd6ee6b9f679ec4d597b38bc5
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 8654ff9318f4..e3c796d22702 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 db8a66b39fd7..6922eadf68c8 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 6f08dffb9e9a..0f36c36f065f 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 83565c3b1992..cfe43426db52 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 d6aa9a5a874e..d252a43e4df6 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 d936c2f92ada..134a4af37091 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 0357c1686fec..db71766b2dd2 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _md5_=f9777c11b201ce8e54fdb4c143832bfd
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r5 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
index fc8b110b3e48..c2292b387619 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=059cc9a4ad7fe562359e8db875e5e2e7
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 b81a62bca015..b00b7b502e92 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 0e452c439694..d25a4559e540 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 30e9d6a1ef72..419b2a3bf455 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 5667dafc7693..55462718c445 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 7df1295dd343..49b7b85cc08d 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 5cf15a5ca955..af2fc78cefd8 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 ab7e640fc081..7d379e36ff0b 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 8a3b12e86d32..34e25010273a 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _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 92e1f1440d5f..e6b9fe2b549f 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _md5_=8d417d53c02c7ddda1c12ed921471c2d
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 4577ce602d3f..f2df01dad2c5 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _md5_=1edff5e584aae5eb0dd2c080d5f1f9c4
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 452d10adde60..3d0cb2c114c9 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_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	ant-tasks	f4cef80c43613a641f3f0f22d74883f0
 _md5_=80b30c32b257df29fde82bdf94428c6f
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
index a7adcb90d2b4..820739f476db 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jre:1.8 >=dev-java/ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=024d611dae6922351631e7f7f594bca7
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1 b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
index 1ebcd376e017..919372cdae4c 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=7c66aa75cfeb1d877ddbc7a33913c75a
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r3 b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
index fb7e66986c43..6fb6baee2c27 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r3
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/commons/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=d6f05ed1b930f79f2053d5f3e336da4a
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r3 b/metadata/md5-cache/dev-java/byaccj-1.15-r3
index d6e2bfd285eb..6c2ff3b16a23 100644
--- a/metadata/md5-cache/dev-java/byaccj-1.15-r3
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0
 _md5_=dffe0832c25cd0244cdfc6f06811c450
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 c2fe563e1222..89c7b4ddf7f9 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/c3p0/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=f30bf992da1014f795384a7c04867797
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
index a2d8aebd2378..8d1b7738bc66 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2-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://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=61692e9bdfa9f11d45ea3ae996e6ac9c
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.3 b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
index a39f640c3197..add1685ab4c9 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.3
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz.asc )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=7902829c493349f239b87ed827604b4a
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
index f7fd6037c7b7..4362ac398fa0 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r3 b/metadata/md5-cache/dev-java/commons-lang-2.6-r3
index 5a66a1da50e2..17d94bb18c57 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r3
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r3
@@ -12,5 +12,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/lang/source/commons-lang-2.6-src.tar.gz.asc )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=78f8e85424664b777fe94f78ea37ba3a
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
index c3ad33e5082e..f5340ab45e04 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core: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=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=7fe2e1d80a50330b345a7433034ced4f
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 03fd5339b573..bb8e2e78de8b 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
index 0d2ba9d93be5..9a04f6d20a2f 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/xerces:2 >=dev-java/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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r4 b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
index 5b03cac104e5..2c848bfb9890 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r4
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=c4267c86a013dd64bbab4bb5874832e5
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 003d351e8dc2..b9bdc7cf5325 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_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=367ae75dc05c4448025f00e17507b758
diff --git a/metadata/md5-cache/dev-java/freenet-ext-29 b/metadata/md5-cache/dev-java/freenet-ext-29
index 08715d015416..28323d9d57fc 100644
--- a/metadata/md5-cache/dev-java/freenet-ext-29
+++ b/metadata/md5-cache/dev-java/freenet-ext-29
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=29
 SRC_URI=https://github.com/hyphanet/contrib/archive/v29.tar.gz -> freenet-ext-29.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0
 _md5_=4425e45f7277948066b5a52e011c59b6
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 e8665b054258..a0d0b64acb4d 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=2411d184bca3209b2a42c682775c8ad2
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
index 62f0982a2fd8..088012fab536 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
@@ -10,5 +10,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=2eda64ba01f7d0e0fdbb0489beb321e9
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 5b7fc51e596a..1d9c3721d151 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _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 0c67dfc30d46..c0e83a2a97d4 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=ff32efc4c783593995d5cb71417aa35b
diff --git a/metadata/md5-cache/dev-java/icedtea-3.21.0 b/metadata/md5-cache/dev-java/icedtea-3.21.0
index 844c334070e0..8ed7e654de9f 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.21.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/openjdk.tar.xz -> icedtea-3.21-openjdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/corba.tar.xz -> icedtea-3.21-corba-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxp.tar.xz -> icedtea-3.21-jaxp-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxws.tar.xz -> icedtea-3.21-jaxws-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jdk.tar.xz -> icedtea-3.21-jdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/hotspot.tar.xz -> icedtea-3.21-hotspot-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/nashorn.tar.xz -> icedtea-3.21-nashorn-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/langtools.tar.xz -> icedtea-3.21-langtools-3.21.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/shenandoah.tar.xz -> icedtea-3.21-shenandoah-3.21.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/aarch32.tar.xz -> icedtea-3.21-aarch32-3.21.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	c61c368a76fdf3a82fdf8dbaebea3804	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	ltprune	97143780d341cc8d8f1d4c6187a36d29	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	c61c368a76fdf3a82fdf8dbaebea3804	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	ltprune	97143780d341cc8d8f1d4c6187a36d29	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=b80119a1990d211bd58f3cba3241bd88
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
index 7d90daf1b526..a1da6bd694ab 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib-build	e8aed98bd43dbd25694310a660ad562c
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib-build	e8aed98bd43dbd25694310a660ad562c
 _md5_=4bc6a6c3d396914bb57c6503c2835e94
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
index 610d6468b4a5..5c5618df0fee 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
@@ -15,5 +15,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib-build	e8aed98bd43dbd25694310a660ad562c
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib-build	e8aed98bd43dbd25694310a660ad562c
 _md5_=d7c1bf31512893365fabb51f42f5baa5
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
index c14fbbe2961e..bb9349d9e13c 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8:* >=dev-java/java-con
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	cargo	8520ae1bed0e6965d027399b471a3595	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	cargo	8520ae1bed0e6965d027399b471a3595	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=152e6755ea5728eb8ac17fbf5596f575
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 1d16c4ae21fe..d3d5b54c756a 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -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
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0
 _md5_=7c3b952cdf55a9fb767e8b28506fb677
diff --git a/metadata/md5-cache/dev-java/java-config-2.3.1-r1 b/metadata/md5-cache/dev-java/java-config-2.3.1-r1
index 367b71a6c40e..1557bd838959 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	12aa0037eb004139215ff04894d52b28	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	distutils-r1	24344aec2be39c69d9f279b5415298ce	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	12aa0037eb004139215ff04894d52b28	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	distutils-r1	24344aec2be39c69d9f279b5415298ce	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=73fb367efc1796f3ea4d04ced78a626c
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 1721be15bdf9..4291ff582fc3 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -12,5 +12,5 @@ RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_10(-)?,
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	12aa0037eb004139215ff04894d52b28	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	distutils-r1	24344aec2be39c69d9f279b5415298ce	prefix	eab3c99d77fe00506c109c8a736186f7	git-r3	2358a7b20091609e24bd3a83b3ac5991
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	12aa0037eb004139215ff04894d52b28	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	distutils-r1	24344aec2be39c69d9f279b5415298ce	prefix	eab3c99d77fe00506c109c8a736186f7	git-r3	2358a7b20091609e24bd3a83b3ac5991
 _md5_=69edcab6eb1ad0bd453c89588893dae0
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1 b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
index 99508c119b31..940315fbf2c5 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=3c2aef5e083b2c5cc82a44999aaaad3d
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 e1f4a4d75c01..cfbcca2458da 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=0289e85479573729c116bd0e84ef1649
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
index 0c30bd68ff36..d1480c16b0f0 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r4
@@ -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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=d89460767e9b517238fbed3a2464460d
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 34208e6c6696..b020458a8f5b 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _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 6da1b522f99a..351506c67451 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=affaa6213111dd69d75e3f3d70a021a5
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index 7b19938be922..ee2aadc50382 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targe
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.7.tar.bz2
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	12aa0037eb004139215ff04894d52b28	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	distutils-r1	24344aec2be39c69d9f279b5415298ce	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	12aa0037eb004139215ff04894d52b28	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	distutils-r1	24344aec2be39c69d9f279b5415298ce	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=c86060b33042743877765498605e7226
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
index 5d00cbcbd3dd..4cca67c24466 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _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 1dfe5b08cfc8..f36ef022fbfb 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10 b/metadata/md5-cache/dev-java/jdepend-2.10
index 1ad3dabacd6d..62f53c6e4b33 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10
+++ b/metadata/md5-cache/dev-java/jdepend-2.10
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/clarkware/jdepend/archive/refs/tags/2.10.tar.gz -> jdepend-2.10.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=e95a132893c926604ff3b29f02d8d597
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 7e850776c8d0..2c86d9a0229c 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jna-5.13.0-r1 b/metadata/md5-cache/dev-java/jna-5.13.0-r1
index 3d51d331006e..8da7729279da 100644
--- a/metadata/md5-cache/dev-java/jna-5.13.0-r1
+++ b/metadata/md5-cache/dev-java/jna-5.13.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/5.13.0.tar.gz -> jna-5.13.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0
 _md5_=baa09454187fd31064ef8fd3bdde94fb
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index 0f734362e9b8..8b479d5ce17a 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r2 b/metadata/md5-cache/dev-java/libg-2.1.0-r2
index be4f3dde0556..7ed680fcb14a 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=f0a9c234e14606974c5cd4c4f7050818
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 77f251d4b2c1..9c4efef7c87b 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=590e0bfc50c22320d0caef8faa97ffbd
diff --git a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1 b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
index 39468d52c213..a5d37bf1d219 100644
--- a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* app-arch/lz4:= >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lz4/lz4-java/archive/refs/tags/1.8.0.tar.gz -> lz4-java-1.8.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=ea5f1bb76e73263100fbc2e08c2e1244
diff --git a/metadata/md5-cache/dev-java/lzma-22.01 b/metadata/md5-cache/dev-java/lzma-22.01
index 1a78cf20b377..33ff4017dbb4 100644
--- a/metadata/md5-cache/dev-java/lzma-22.01
+++ b/metadata/md5-cache/dev-java/lzma-22.01
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://7-zip.org/a/lzma2201.7z -> lzma-22.01.7z
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _md5_=c1691f5689ab4c5928981f3e5e407225
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.18_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.18_p10
index b05be8d6e14c..5d88f49902ab 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.18_p10
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.18_p10
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.18-ga.tar.gz -> openjdk-11.0.18_p10.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=529cf7b277463f0a9de6a3153d0e6f30
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.19_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.19_p7
index 64346e588904..43ad130c7992 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.19_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.19_p7
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.19-ga.tar.gz -> openjdk-11.0.19_p7.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=46a7ede505db6b13c0489be69018a45a
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1 b/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
index 0f67c039421b..d8fac71f89b6 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.20.1-ga.tar.gz -> openjdk-11.0.20.1_p1.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=46a7ede505db6b13c0489be69018a45a
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
index 7ce352e8c6d3..36ca5e1a554d 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.6-ga.tar.gz -> openjdk-17.0.6_p10.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=e0451e3948b271b8ddccd6180758bdbb
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1 b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1
index 3424713b73f5..4e6b12e375d7 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.6-ga.tar.gz -> openjdk-17.0.6_p10.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2c461a4289ba1fdc5e3155e34c1d09a1
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.7_p7 b/metadata/md5-cache/dev-java/openjdk-17.0.7_p7
index 162a0c926ea1..bd4d07a1db48 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.7_p7
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.7_p7
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.7-ga.tar.gz -> openjdk-17.0.7_p7.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=16fb16a7a434b4fffaefc6137a8dedac
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1 b/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
index 8e3ae13c9245..f6ba05157a17 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.8.1-ga.tar.gz -> openjdk-17.0.8.1_p1.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=c12e9436ed39e3da003b0930eeeea075
diff --git a/metadata/md5-cache/dev-java/openjdk-8.362_p09 b/metadata/md5-cache/dev-java/openjdk-8.362_p09
index 028596292b35..8127f944b362 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.362_p09
+++ b/metadata/md5-cache/dev-java/openjdk-8.362_p09
@@ -12,5 +12,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u362-ga.tar.gz -> openjdk-8.362_p09.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=8a4199a11397c0cef77d81864f6f7dd8
diff --git a/metadata/md5-cache/dev-java/openjdk-8.372_p07 b/metadata/md5-cache/dev-java/openjdk-8.372_p07
index d11b29d6c382..98616db3ddd0 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.372_p07
+++ b/metadata/md5-cache/dev-java/openjdk-8.372_p07
@@ -12,5 +12,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u372-ga.tar.gz -> openjdk-8.372_p07.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=48fddb2bf6533ef5f33b1322f17a5c47
diff --git a/metadata/md5-cache/dev-java/openjdk-8.382_p05 b/metadata/md5-cache/dev-java/openjdk-8.382_p05
index 480f3857464b..107d5f12cddb 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.382_p05
+++ b/metadata/md5-cache/dev-java/openjdk-8.382_p05
@@ -12,5 +12,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u382-ga.tar.gz -> openjdk-8.382_p05.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=48fddb2bf6533ef5f33b1322f17a5c47
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.18_p10 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.18_p10
index f09e01eb084a..7858f8569ed6 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.18_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.18_p10
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz ) arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10//OpenJDK11U-jdk_arm_linux_hotspot_11.0.18_10.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.18_10.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10//OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10//OpenJDK11U-jdk_x64_mac_hotspot_11.0.18_10.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.18_10.tar.gz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=ba263eeca64808feb0f816f64f40a903
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.19_p7 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.19_p7
index 4d14ef186541..3f7fbcee7147 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.19_p7
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.19_p7
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz ) arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7//OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7//OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7//OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=7c632de90adaca1558ff4524efa09573
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.20.1_p1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.20.1_p1
index cbfe545c731f..546be666d78d 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.20.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.20.1_p1
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20.1_1.tar.gz ) arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1//OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.20.1_1.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1//OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1//OpenJDK11U-jdk_x64_mac_hotspot_11.0.20.1_1.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.20.1_1.tar.gz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=7c632de90adaca1558ff4524efa09573
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.6_p10
index 506cbc52b004..4f2efbf1f59a 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.6_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.6_p10
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.6_10.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_arm_linux_hotspot_17.0.6_10.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.6_10.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.6_10.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10//OpenJDK17U-jdk_x64_mac_hotspot_17.0.6_10.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=be70fcd7b42ee49d146e4e72a0c6c67a
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.7_p7 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.7_p7
index 9d9b4219ad50..801454f052e3 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.7_p7
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.7_p7
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7//OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=ff6a1b03b163febd13376542ed09dc23
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.8.1_p1 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.8.1_p1
index 34ef246cc5a7..c534d940c125 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.8.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.8.1_p1
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.8.1_1.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.8.1_1.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1//OpenJDK17U-jdk_x64_mac_hotspot_17.0.8.1_1.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=ff6a1b03b163febd13376542ed09dc23
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.362_p09 b/metadata/md5-cache/dev-java/openjdk-bin-8.362_p09
index 5a2760ba8c6d..8f175e7bbeb2 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.362_p09
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.362_p09
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u362b09.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u362b09.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u362b09.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u362b09.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u362b09.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u362b09.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=ec4f1b3e64e7f2f1d16a5880b5bb6a21
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.372_p07 b/metadata/md5-cache/dev-java/openjdk-bin-8.372_p07
index 579870016b6d..259d4a29049e 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.372_p07
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.372_p07
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=fc7e3fcdd289c1b6dba36f7de48de79d
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.382_p05 b/metadata/md5-cache/dev-java/openjdk-bin-8.382_p05
index 86f667ab851c..878316eb839a 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.382_p05
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.382_p05
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u382b05.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_mac_hotspot_8u382b05.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=fc7e3fcdd289c1b6dba36f7de48de79d
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.18_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.18_p10
index 7d408d2a725d..13dc324a74a0 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.18_p10
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.18_p10
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18+10/OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=cb13bf91ecc9e5c8186c9dc1f3e05784
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.19_p7 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.19_p7
index d298fada5ac0..6dd75719fe71 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.19_p7
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.19_p7
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19+7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=70b7b3cafde933c1e06717b740174be6
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1
index 2c8d87906d87..f7496a87a9c2 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1/OpenJDK11U-jre_x64_linux_hotspot_11.0.20.1_1.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=70b7b3cafde933c1e06717b740174be6
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.6_p10
index d502afab6204..26bf491a4277 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.6_p10
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.6_p10
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6+10/OpenJDK17U-jre_x64_linux_hotspot_17.0.6_10.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=cb13bf91ecc9e5c8186c9dc1f3e05784
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.7_p7 b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.7_p7
index 3ed16b62525b..6976629ae875 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.7_p7
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.7_p7
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7+7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=70b7b3cafde933c1e06717b740174be6
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1
index 174e4af3a7d7..cb70a49fc8e7 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1/OpenJDK17U-jre_x64_linux_hotspot_17.0.8.1_1.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=70b7b3cafde933c1e06717b740174be6
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.362_p09 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.362_p09
index 9ec383f1fe95..1727e8d6efc1 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.362_p09
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.362_p09
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jre_x64_linux_hotspot_8u362b09.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=48a365bb3e28eddfa75d535d5b666e9d
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.372_p07 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.372_p07
index 7a446d6a4200..d27088a89a61 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.372_p07
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.372_p07
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=05859242b4e6fdcb67892c75a77dfdee
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05
index 35e359e22b42..b7aa20994046 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	xdg-utils	baea6080dd821f5562d715887954c9d3	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa
 _md5_=05859242b4e6fdcb67892c75a77dfdee
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1 b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
index 5fc595be3ba5..d9f0dd3d0477 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-core dev-java/swt:4.10[cairo,opengl] dev-libs/
 REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.11+1.tar.bz2 -> openjfx-11.0.11_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=536541e5a1852b78fecc6882ce3c5643
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1 b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
index d9ff0fb38326..a630a15a537d 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-core dev-java/swt:4.10[cairo,opengl] dev-libs/
 REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.9+0.tar.bz2 -> openjfx-11.0.9_p0.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=d70a0984f2a715eb43ce81a47503b5d8
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000-r1 b/metadata/md5-cache/dev-java/openjfx-8.1000-r1
index f71116204190..19f6b9ce02ea 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000-r1
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=8e2486d22a66faedd9c373b25e28e2ac
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
index 6039ba941998..02c5aba90611 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=b5ad8db98fdd4ae0e864800547a520f6
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.23.0 b/metadata/md5-cache/dev-java/protobuf-java-3.23.0
index 3b1c9f5a25a9..99a911c142c7 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.23.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.23.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.0.tar.gz -> protobuf-23.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	fc2f89084f590ac95c004ea95b0d2f80
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	fc2f89084f590ac95c004ea95b0d2f80
 _md5_=ae2b87600366de7588d058fae095060d
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.24.2 b/metadata/md5-cache/dev-java/protobuf-java-3.24.2
index 59b999521a70..32682d5041ab 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.24.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.24.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v24.2.tar.gz -> protobuf-24.2.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	fc2f89084f590ac95c004ea95b0d2f80
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	fc2f89084f590ac95c004ea95b0d2f80
 _md5_=8cf26f90f9f03a4081c860637f98531e
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
index 04b23a1623d2..7b6326b251ea 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4
 _md5_=4b1b6bb6d744203a2ff99f29dd2f5915
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 a85a807ea415..cb000f3642ad 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/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=714ce958990a1f8eef01a9a22a724c8d
diff --git a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.0 b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.0
index 87d4c0a503aa..db22cdc2b2d2 100644
--- a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.0
+++ b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11 sys-libs/zlib
 SLOT=0
 SRC_URI=!amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.0/scala-cli -> scala-cli-non-native-1.0.0 ) ) amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.0/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-1.0.0.gz ) arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.0/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-1.0.0.gz )
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
 _md5_=75d7d039c0f25c439517d841da30099f
diff --git a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.1 b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.1
index b559eac18c8c..68f1e1e6457f 100644
--- a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.1
+++ b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11 sys-libs/zlib
 SLOT=0
 SRC_URI=!amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.1/scala-cli -> scala-cli-non-native-1.0.1 ) ) amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.1/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-1.0.1.gz ) arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.1/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-1.0.1.gz )
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
 _md5_=75d7d039c0f25c439517d841da30099f
diff --git a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.2 b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.2
index f43d90a0ffba..ae3b83c46410 100644
--- a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.2
+++ b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11 sys-libs/zlib
 SLOT=0
 SRC_URI=!amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.2/scala-cli -> scala-cli-non-native-1.0.2 ) ) amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.2/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-1.0.2.gz ) arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.2/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-1.0.2.gz )
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
 _md5_=75d7d039c0f25c439517d841da30099f
diff --git a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.4 b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.4
index cd118e704b2f..44e0158551e6 100644
--- a/metadata/md5-cache/dev-java/scala-cli-bin-1.0.4
+++ b/metadata/md5-cache/dev-java/scala-cli-bin-1.0.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11 sys-libs/zlib
 SLOT=0
 SRC_URI=!amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.4/scala-cli -> scala-cli-non-native-1.0.4 ) ) amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.4/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-1.0.4.gz ) arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v1.0.4/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-1.0.4.gz )
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff
 _md5_=2a42956f8fc0f2d22acfceec82914156
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.10.1 b/metadata/md5-cache/dev-java/snappy-1.1.10.1
index 6ada568234cd..fd9cc1665a46 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.10.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.10.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshu
 RESTRICT=!test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/v1.1.10.1.tar.gz -> snappy-1.1.10.1.tar.gz test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/3.3.5/hadoop-common-3.3.5.jar )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc
 _md5_=36eb9c77c859170f1a796806bc0b8851
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1 b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
index 60fd427031e3..21d7941952d3 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshu
 RESTRICT=test !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.7.8.tar.gz -> snappy-java-1.1.7.8.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=ba505339ff58699ea6ab2f92b898f948
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 838d3ef9ccdf..507f3398201f 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81
 _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 7c93de1c0316..0e8d40d7f6f9 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_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81
 _md5_=9357b69c0bdc450cae3296a3992da441
diff --git a/metadata/md5-cache/dev-java/swt-4.28-r1 b/metadata/md5-cache/dev-java/swt-4.28-r1
index cc782ff62679..0295c10f6e19 100644
--- a/metadata/md5-cache/dev-java/swt-4.28-r1
+++ b/metadata/md5-cache/dev-java/swt-4.28-r1
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.27
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/swt-4.28-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/swt-4.28-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/swt-4.28-gtk-linux-ppc64le.zip )
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a
 _md5_=25bdc7d4d327714f2bffb21c277adb13
diff --git a/metadata/md5-cache/dev-java/swt-4.29 b/metadata/md5-cache/dev-java/swt-4.29
index f415ea0f310c..40684c7d1567 100644
--- a/metadata/md5-cache/dev-java/swt-4.29
+++ b/metadata/md5-cache/dev-java/swt-4.29
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.27
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-ppc64le.zip )
-_eclasses_=toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a
+_eclasses_=toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a
 _md5_=8ffb76814b406129670dc1f964932c80
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.38 b/metadata/md5-cache/dev-java/tomcat-native-1.2.38
index 6ae9ec435e2b..446306633abf 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.38
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.38
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz.asc )
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=a25a7a4f82699b0144b9a747532b707e
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.5 b/metadata/md5-cache/dev-java/tomcat-native-2.0.5
index de7eebcd5d1a..1f1a4eed1564 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.5
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.5
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz.asc )
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=8a88829912bf8cfb68e791158a9c0db5
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 4db13a70e203..d0e9c76f1d69 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=d65353f5132fb112929415131a525e35
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
index ff2ef84740bd..60e3d91bbd70 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.8:* ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=07982f7ae8bc859a63a836beef79e60d
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
index 0d5c5e3dd27f..092425f10100 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r1
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=9394d087cfd29588535e4561e6d5d06a
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 c613d864df52..6069a7ed85f1 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-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	java-ant-2	19239227fab7816f57abbc0c7d819396
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	java-ant-2	19239227fab7816f57abbc0c7d819396
 _md5_=c997da50407e1c5b051225df8e317c3c
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
index bef78861eff0..303de55d5174 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/c1.5.2-5.tar.gz -> zstd-jni-1.5.2.5.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	862d337d98edb576796827be2c6b11ca	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	fc2f89084f590ac95c004ea95b0d2f80
+_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	fc2f89084f590ac95c004ea95b0d2f80
 _md5_=9b364aea5da8cf709ebb9db674de07ce