gentoo auto-resync : 28:10:2024 - 03:04:40

33 files changed, 39 insertions, 275 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e542b59687ea..1e0d560fe600 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
deleted file mode 100644
index 130d09dcfe16..000000000000
--- a/dev-java/ant-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD ant-core-1.10.14.ebuild 550 BLAKE2B b2bb309504ce51d2ebd2b35b5700c21a2367ecd8d5e6b420731f07560f3b01e3f32ecbadd37a702b0951d998182856bea4f43ea14fe35bfbade15dad8a8e8d61 SHA512 c33aed24a48f98c5bcb631b61ae7618940cf6ad389948398918ab8bcebe967c4e2632fb7b48756554e4c00eca4d148c61f255c24d9fc5c6c13e7f7a467a43e0b
-MISC metadata.xml 434 BLAKE2B f6e80b35f9e2744a724af5869f1c1ca894e2a5b1732ea39ab3025dff60928612df0a582f958df34402d365f32c14b452be62a07328df6e6b13f4de534936f8a0 SHA512 db54bd8fcf1763471b4fba7bc846f27b1049d85bf242fedf4428be1c1c91eab34c7686f26b7c730e795739e95bedea7174f3579871ecc94f5cae634dfaef68a7
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
deleted file mode 100644
index d5273521eb19..000000000000
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-DESCRIPTION="Compatibility link to ant-core for >=dev-java/ant-1.10.14"
-HOMEPAGE="https://ant.apache.org/"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	~dev-java/ant-${PV}:0
-	>=virtual/jdk-1.8:*
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_regjar /usr/share/ant-core/lib/ant.jar
-}
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
deleted file mode 100644
index d0bcffb03628..000000000000
--- a/dev-java/ant-core/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant</bugs-to>
-		<doc>https://ant.apache.org/manual/</doc>
-		<remote-id type="github">apache/ant</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/cache2k-api/Manifest b/dev-java/cache2k-api/Manifest
index 43449ca46697..01ebbb6fb4fc 100644
--- a/dev-java/cache2k-api/Manifest
+++ b/dev-java/cache2k-api/Manifest
@@ -1,3 +1,3 @@
 DIST cache2k-0.23.1.tar.gz 552229 BLAKE2B 7cd47eeb4d0f154a2dba0617ef29c97eadf3cd142e815b0ac760e2b9b2bcf4a9698c17897931d612f9e544ec0aa496d115caf66128ecbfd08a9f74e1d9da01b4 SHA512 205315f13e634ba4f8f38938ea29e15d9750a7ac9542a4f6eb0839868b34b762b1db9de898ce59a47905b11712386de73c01a12756003fd586efcd24b3220233
-EBUILD cache2k-api-0.23.1.ebuild 593 BLAKE2B d51df6185f4fbfdd3191b64f44b05f3d864ed50756d2e47620215687c849211ec58f1f95491bdbc35f4c30872ca7379a918c7a35c16afc4416d82f88a64a674b SHA512 593300348d4c2001c529b93b01db2d9b88f85b9c47233d188e118f4847fda513b969da3cc3196bafb2b7e84592e97fb116025136d65e59dd2f331811244ced2d
+EBUILD cache2k-api-0.23.1.ebuild 593 BLAKE2B 291ff8bb8c9b035c3ea043739f005d48d0b401097f05e6a1f513e7afb3a347bc011ac4731445757e7c11ef9af2b5e8ac89b9f1f4d3a12c396c56e0a06a1a7c49 SHA512 b267b1d090ef53b92aeea5e949f8a77d14a9ff329712d31f9059a1b6091e9a455f5041e153d815bf030ee70df5268ca8dbde29736a060ed7a0f51d83ad040126
 MISC metadata.xml 575 BLAKE2B ce29f24866ed89628d80c5e3ec4680cb97f0b0a5855e2e4a93df8043552313fb68f52780134e11969c2c4f316d634257b0468089899ddadcdb838ed7e7e7f96d SHA512 3b395977ac66c65eaf33777940b13f3797efc8cbde68176b29056fa243abaca24b792d5b72e34ad40a3d9d90a89f2eaa4654401fb6ae7d49550d6240d45624ff
diff --git a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild
index 2ce7b773296a..fef04eece7ac 100644
--- a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild
+++ b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild
@@ -11,6 +11,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="light weight and high performance Java caching library: API"
 HOMEPAGE="https://cache2k.org"
 SRC_URI="https://github.com/cache2k/cache2k/archive/v${PV}.tar.gz -> cache2k-${PV}.tar.gz"
+S="${WORKDIR}/cache2k-${PV}/api"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
@@ -18,6 +20,4 @@ KEYWORDS="amd64 ~arm64"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/cache2k-${PV}/api"
-
 JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/cache2k-core/Manifest b/dev-java/cache2k-core/Manifest
index 046af3eff1c0..ae17629a17b1 100644
--- a/dev-java/cache2k-core/Manifest
+++ b/dev-java/cache2k-core/Manifest
@@ -1,3 +1,3 @@
 DIST cache2k-0.23.1.tar.gz 552229 BLAKE2B 7cd47eeb4d0f154a2dba0617ef29c97eadf3cd142e815b0ac760e2b9b2bcf4a9698c17897931d612f9e544ec0aa496d115caf66128ecbfd08a9f74e1d9da01b4 SHA512 205315f13e634ba4f8f38938ea29e15d9750a7ac9542a4f6eb0839868b34b762b1db9de898ce59a47905b11712386de73c01a12756003fd586efcd24b3220233
-EBUILD cache2k-core-0.23.1.ebuild 838 BLAKE2B f700fc1422cdb7eb3240be6b369aac005e04c0b38ff495dc9dee0d70d6fadb5a212a29c88973a8a2e5ca1f149741471ca559fdaeb46c11421c55da731cca662b SHA512 f15a90bdf69c05fce5eb4b35d411738ca1ca0add2e6707f1fc888835606c81aab416d302c7c66ef8e4b7cae5eeef36f2a26d17b0abeca79602a906323a0ed58a
+EBUILD cache2k-core-0.23.1.ebuild 838 BLAKE2B 73fbf59277a260064988a896b6783ae76507d4c2d45fb422e472f669b62c1b44e445b5a2955b9d7396145c66247872ea6397d62596ee845d78b5222995eba800 SHA512 8e6cad3c8cb40ded235c06540cbbeba9731b3eaaf1cad4fa3902c6870b601dfd5bfb3cfdd18defbcd76fa76c0b48c770798231273e2986c77d0852466645b21e
 MISC metadata.xml 575 BLAKE2B ce29f24866ed89628d80c5e3ec4680cb97f0b0a5855e2e4a93df8043552313fb68f52780134e11969c2c4f316d634257b0468089899ddadcdb838ed7e7e7f96d SHA512 3b395977ac66c65eaf33777940b13f3797efc8cbde68176b29056fa243abaca24b792d5b72e34ad40a3d9d90a89f2eaa4654401fb6ae7d49550d6240d45624ff
diff --git a/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild b/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild
index 54b82f7d35c9..21b4ebc699eb 100644
--- a/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild
+++ b/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,6 +12,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="light weight and high performance Java caching library: core"
 HOMEPAGE="https://cache2k.org"
 SRC_URI="https://github.com/cache2k/cache2k/archive/v${PV}.tar.gz -> cache2k-${PV}.tar.gz"
+S="${WORKDIR}/cache2k-${PV}/core"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
@@ -29,8 +31,6 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}/cache2k-${PV}/core"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS=( "src/main/resources" )
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
index 063b4a94d4b9..8a8f2c884856 100644
--- a/dev-java/cdi-api/Manifest
+++ b/dev-java/cdi-api/Manifest
@@ -1,5 +1,4 @@
 AUX cdi-api-4.0.1-skip-tests.patch 2530 BLAKE2B 6b4fac604f1b3692ce4150b2e6f29d60a32004dd61a7cd4f12e092bb43e8bed6a1ddc33ad711e0f3025ec95f37a8aba11c305e9df23b3f11e29021baa3808e17 SHA512 0d7d99baea9cbc21e9bc435118f793c6a11d802968b24aed20a65b337b3cebb7d50e37a493084deaa7961c64bfd4f2b96f0750897b0589586b3e89077edf364e
 DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e
-EBUILD cdi-api-4.0.1-r2.ebuild 2670 BLAKE2B 869fbc84a4872c566d9ac6ab2312e2e22e5c494e752f9d6f0618070c05b28f6f99b5aff9379e85c7cd29ba785743d6510b6a695954065a5d3333b23ce12b43ef SHA512 d638585bf00ca8065a893a9fb76c42aec2b98cc00b830bb526e06869aca4f60e5811c5468ffd7800bb7d2c57cd136174f230a1c1c556efaaa1904ae2b9fd7a4f
-EBUILD cdi-api-4.0.1-r3.ebuild 2954 BLAKE2B 7ffbb1d3b6302208cb22f90b9ff2f526ffaca2d3bce1b6a64696df7d109cc61c36251a068173fb62bff5cb248c4de50b0bab6ed1a69cc530b896d518d185dfe5 SHA512 2220c4b93abd347b875fa9a96591eb6ab7d1e9faf3c34dd75da676cab6eb5243186a829476f266875fcd1960fde3976df7e969ce71068dc546fbb4e5c3f8ffdd
+EBUILD cdi-api-4.0.1-r3.ebuild 2953 BLAKE2B a97466f63b16de80aaeae1181361481729cb29b5c298aade77d47daffcfcf215aae97cecd9dffa16b30d8305abb01a0c367a12e4dc84ae122481a351f6832a56 SHA512 79c6423834685acd0b29627876077b97433551672f1b5cb4fead504a64fca520c7c4467f945d13e0787bf180e7fe1e33c7fb18419e95c1c90eff4db1a517630a
 MISC metadata.xml 295 BLAKE2B 349f4209d0a1dac5a43b3cc197c78aadf3263cfb1e6ddfa39b4ea54bf5b4883a80e800b600720b745a86ee6defe57304736910fc4bb42ee1c1f57f35a3936ea0 SHA512 6f7bf9a1c0e9418a7a0d3cc2baa8f6cbbcf1b4a7abf7f4501d718355d778966b3a16f56bd30c5136d7fb96597d3377e61cbb9a9d840b53fa4da26e00cb3d72e1
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
deleted file mode 100644
index 275c3587d5ac..000000000000
--- a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild cdi-api-4.0.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
-JAVA_TESTING_FRAMEWORKS="testng"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi"
-SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-EL_API_SLOT="5.0"
-
-DEPEND="
-	dev-java/injection-api:0
-	dev-java/jakarta-annotations-api:0
-	dev-java/jakarta-el-api:${EL_API_SLOT}
-	dev-java/jakarta-interceptors:0
-	>=virtual/jdk-11:*
-"
-RDEPEND=">=virtual/jre-11:*"
-
-DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md )
-
-PATCHES=(
-	# https://bugs.gentoo.org/856412
-	# org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1
-	# org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5
-	"${FILESDIR}/cdi-api-4.0.1-skip-tests.patch"
-)
-
-S="${WORKDIR}/cdi-${PV}"
-
-JAVA_TEST_GENTOO_CLASSPATH="testng"
-JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" )
-JAVA_TEST_SRC_DIR="api/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="api/src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Tests run: 1, Failures: 1
-	org.jboss.cdi.api.test.privileged.CDIPrivilegedTest
-)
-
-src_prepare(){
-	default # https://bugs.gentoo.org/780585
-}
-
-src_compile() {
-	JAVA_CLASSPATH_EXTRA="
-		injection-api
-		jakarta-annotations-api
-		jakarta-el-api-${EL_API_SLOT}
-		jakarta-interceptors
-	"
-	JAVA_SRC_DIR="lang-model/src/main/java"
-	JAVA_JAR_FILENAME="lang-model.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":lang-model.jar"
-	rm -r target || die
-
-	JAVA_SRC_DIR="api/src/main/java"
-	JAVA_RESOURCE_DIRS="api/src/main/resources"
-	JAVA_JAR_FILENAME="cdi-api.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":cdi-api.jar"
-	rm -r target || die
-
-	if use doc; then
-		rm lang-model/src/main/java/module-info.java || die
-		JAVA_SRC_DIR=(
-			"lang-model/src/main/java"
-			"api/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar "lang-model.jar"
-	java-pkg_dojar "cdi-api.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "lang-model/src/main/java/*"
-		java-pkg_dosrc "api/src/main/java/*"
-	fi
-}
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
index 3c601b4e7d8e..9662f5535c67 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/cdi-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 EL_API_SLOT="5.0"
 
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index c4919e9ba866..a2f0603beb04 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,7 +1,4 @@
-DIST commons-compress-1.26.1-src.tar.gz 54843710 BLAKE2B 84c4c1363a4396a06773a8c120f5f32d98fceaa139e33a2a27df79a9aea41b8084a93a5735b0c4cd17fa88c404060af2336ab20f127acceb0da948ff170164c3 SHA512 096c94344a9bbcd021a3cce0869456cf6d22ca5136b63de017922d7c3de5d94b591961fe550201b654f9dc90b2cd8f32ef9bf1e507fddfb2e2f7c33bddc790c4
-DIST commons-compress-1.26.1-src.tar.gz.asc 488 BLAKE2B 4df27d6d7ab226eb87ca6b7691c677b95d59c2d37f44ced6a5c0586aefa2506c9a635d869fd181526149416c228a8859a961386ca98519dc080709a55d9264c9 SHA512 b9533d63f961022ca42e79f8aed91a6c4b8a91cb0f3aa095a4ffa2202ed87d171f6c0d32babfbd730eb0c250be2331da4bd12e5251f7e7076f78536d20d96ced
 DIST commons-compress-1.27.1-src.tar.gz 61131529 BLAKE2B d6109c33d833548228e2bdcb2a5563526a7adede825de7422108d9e0890942e875b28032527bdc7c329306973c2ddc0da1995f028999c66b1ccefe5830a4a741 SHA512 c7a2cef26959e687ad19b96b5ba8393d7514095e13bf0f29bd41e6b3c3cb2260d8ff23283ff3d5fd137b2522b843e7f0f50ab46bcf0f66df5383674f35f223ab
 DIST commons-compress-1.27.1-src.tar.gz.asc 488 BLAKE2B d7ed8dfae26b41a8884deecfb8b09e827388749f9f2c1f762947dae61635c64a76e4f86171bf893eb4d6ca53e270332a2487afbab3664f33d6618837417e979c SHA512 a7e12ee2470eae3f76540115dfb7817c3ce6142e2ac23bbd42150c32d9b615e889d3c52122b253fa9e56408c99ae5415b4987b6d8b97ff52090f676a2087b2f5
-EBUILD commons-compress-1.26.1.ebuild 1298 BLAKE2B cf52186d17b123885f336837f899458fed8d155ebf7374078ceb84818f70b09b7f55dab5f1e5d00cf91d3af4552f95d209defa8fc0a299a77d7fe24ba2614239 SHA512 1d2dddef37962aa76fc093c730e3c6f099696cb6f9ac945d5d769cf27bba77f7d9aefa1e319e6d7a7e7998bd6fc9b384b9805aa0d1d4361bfbbc89d28d5aff56
-EBUILD commons-compress-1.27.1.ebuild 1995 BLAKE2B d1f4c00b4f9e1243378735f04a578d673994947d954e1458c2fda95e813a7621b75b8b747378dfaff97aa64575ebd11756dafadfe6fc83e6892c4e0a3e250923 SHA512 b2a94d0dd1f08c335b49a1e8848fe785a0bc1cdd79c9a55fd3d3b04b180157d748aafcaf9735a8fac7293b464996c3a398d4528d76558b3da2832b6616a6f244
+EBUILD commons-compress-1.27.1.ebuild 1994 BLAKE2B 9cce45dbfe44a0145bff2308d5908ddc76874249d5eef40c5b6633aab2fb43c44eb2dc66cee5c5b477ea024703b246fcd277607604c9583f7af237a337749e26 SHA512 99ca648a9aac0e285b4243091e4c453c89e52eb6378875473f7390f04833d1d97bb3a787963fadf6dfb6f1751893f8a343c9b020ee879e34edd1340bc21235a4
 MISC metadata.xml 325 BLAKE2B 9edddb431124415fe343c5fcfbef16627943a28d12f4bba89559a577e1a2b2eed63a866521f47c504c102c1f5f01cd014c6e453940347ae0bd8e3ebfc5cae68f SHA512 54562f74ac55704a1f09b8dc4d78c5620ba61197e71350d770bddbeafe53c2faaad6d900d284cc265be555d378022b228c6a14b0606f540e2faa16b3df27e939
diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
deleted file mode 100644
index c577a3f5b92d..000000000000
--- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Not ready for running tests, https://bugs.gentoo.org/839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-compress:${PV}"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-CP_DEPEND="
-	dev-java/asm:9
-	dev-java/brotli-dec:0
-	dev-java/commons-codec:0
-	>=dev-java/commons-io-2.15.1:1
-	dev-java/commons-lang:3.6
-	dev-java/xz-java:0
-	dev-java/zstd-jni:0
-"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*
-	dev-java/osgi-core:0"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
-JAVA_CLASSPATH_EXTRA="osgi-core"
-JAVA_ENCODING="iso-8859-1"
-JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-compress/commons-compress-1.27.1.ebuild b/dev-java/commons-compress/commons-compress-1.27.1.ebuild
index 067ad945854f..daf5a74c26c4 100644
--- a/dev-java/commons-compress/commons-compress-1.27.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.27.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 2b68de4f292e..f63136a2d6f3 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,7 +1,4 @@
-DIST commons-io-2.16.1-src.tar.gz 634766 BLAKE2B 5bdc09ec07666ae513944040aae730a8bd5fe4fe65f05aa1f8295b6687f99c588ac4071113b5fa3bdc8f2e4fe0d8b40677c3afba18f332e283f28b5270d5f41c SHA512 07298e3af85726f2ec07a660fbb743f82cd88f8043a57e2e1063b758c81429dfafd77a024e2cdd48efe5d403299c20e898f5b3dd729f52bd55b8a6fb50c9a13a
-DIST commons-io-2.16.1-src.tar.gz.asc 488 BLAKE2B e42af1fe9cbb50371c981737e7899b30d99b8e7045485562614a72307068942b433614e4a1c3cdb17261917a1a5382c5828e290e50f3f3a12a3ed297be53cace SHA512 74e22fd7bf5daf58611537f6c21bd41e10942e3051785e13d771e5fd50e5403144a8d2ed9472de13263da5cbf579911a1aafaa7e43dea9f99fe6ad4011ecb74a
 DIST commons-io-2.17.0-src.tar.gz 652908 BLAKE2B c87f10584d7933215aa24e8bde1037eced0738098149e9423371a1fef0255e36e38a6c92cdafd75eecbf56d13c4c38d479fe2706afc86224900fcaf7cae5e5f5 SHA512 5681b7bab9e34e9051e4f7a48925ecdf5d8814894c2626298dfca7aa0566c2dc46c15843850e3e14a3e05613ae9ef9fd08077042931e2fe552057f9c1bee6b69
 DIST commons-io-2.17.0-src.tar.gz.asc 488 BLAKE2B 451dcfbc952994a2402a7657fb0702572c8873c977681236c26326eec15316d543a39a48530760cf8a7c8b8469c7d18b1a7f88a80ab096d1604c33ec050c9b27 SHA512 8708d9cd17a2805c385006fbd5d0db883b593c67ff4afaaac507ca2dbe9f4b2e51cc1c492577b2e2cc6151a766264f1b3cd7c4b526fe16afa814d7ae29d2722c
-EBUILD commons-io-2.16.1.ebuild 1279 BLAKE2B 916d96bba2c5cdeb57796f458bffcf6f740744a2da9496e81d797e826f27d08cdf25b70b57c2e5626c79e4d700af55312c19d744d803c39c6ca19ba9dbe519c1 SHA512 6dbea6bf20ba5856d9425802a0212973a494c7ec8dc9e272026c7a8ea3443980f792acc1247d281692787b2c6b3c12b7a4c415d57cdb3f0efbba1a51c9dd366f
-EBUILD commons-io-2.17.0.ebuild 1252 BLAKE2B 364e058104d39687077f10e9c5784038c2f097773fc6a76401f0d18ce16cc51e9d71744e6fb47a40d545acb2a0500a353583c460105922d573bc8d260045c850 SHA512 145bd266d57e69516a29dbf343ab834a8705731b7c6bc34b83a2e34d082114ba4030515978ed33c3d0c76a912d5e978494696c4c0eb0ee264ff39dfb1f862386
+EBUILD commons-io-2.17.0.ebuild 1251 BLAKE2B e7e227a79d119ad23301d99e4fe0642c796f0e30f0fc9d01007227768251d5ef1e43065a4a624430160bbf92646968397457f174e8cb420d726dd978ac250906 SHA512 b1300f617b36fb43a085defb7bdf26e2d3131eb7b0036bed3237f0fe2af5e2f83b2c260c0603baf238f2142b37f2f55364ebdf23fe0cb05eb9da11aa7d210a84
 MISC metadata.xml 319 BLAKE2B 0cf0293595d7916fd34cf3a108f6f79e8ce3fc32d4bc02bcb093578e02c5386ed80b50487fb8e663cbcfa98873ab0a5a3763b3b002ff89323617b30c4a1b4143 SHA512 acbe501db8b7fe74845d68c3c288231b2140473652c12b04d4b4edac4a6031be67c470d4b59a170e743023e1f931a7daae647be0a23bf5d227d1fbd9c4927cfa
diff --git a/dev-java/commons-io/commons-io-2.16.1.ebuild b/dev-java/commons-io/commons-io-2.16.1.ebuild
deleted file mode 100644
index af581b24575f..000000000000
--- a/dev-java/commons-io/commons-io-2.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No tests, #839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-io:commons-io:${PV}"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
-HOMEPAGE="https://commons.apache.org/proper/commons-io/"
-SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz
-	verify-sig? ( https://archive.apache.org/dist/commons/io/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-DEPEND=">=virtual/jdk-11:*"	# module-info
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_ENCODING="iso-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-src_compile() {
-	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
-	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
-
-	jdeps --generate-module-info \
-		src/main/java \
-		--multi-release 9 \
-		"${JAVA_JAR_FILENAME}" || die
-
-	JAVA_JAR_FILENAME="${PN}.jar"
-	java-pkg-simple_src_compile	# creates the final jar file including module-info
-
-}
diff --git a/dev-java/commons-io/commons-io-2.17.0.ebuild b/dev-java/commons-io/commons-io-2.17.0.ebuild
index a359b01b88dc..68c6d5fe4ea6 100644
--- a/dev-java/commons-io/commons-io-2.17.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.17.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/identicon/Manifest b/dev-java/identicon/Manifest
index 32c465ee8faf..a83957876c2b 100644
--- a/dev-java/identicon/Manifest
+++ b/dev-java/identicon/Manifest
@@ -1,3 +1,3 @@
 DIST identicon-1.0.tar.gz 12173 BLAKE2B 177f11739dc7a419206f63e9008f6b7830e71cd5adba2c207e5f3d8f420c30fcb7188dad62fe3541fac7a4966e31ef3451fab6a094bb962b749d4ff2e64eb610 SHA512 b8c3a14b69ac14018179be7a61813f05caa1b8e40178f02b973776c8d59867c56d84e3268735218a90dceed7e4e8f47f7acbd4401ab5a13dd6e2c2e155007647
-EBUILD identicon-1.0.ebuild 801 BLAKE2B fc7008c28120f21279861f215cb01a0b2f2a18fd6c18388b4e1b1241f9cae7e4fa480d2f776e8b2016ceb2ff43a791022deb445dba540d5f85089445febf8942 SHA512 d196ae2aefcebc6a6d373e36e82fc033941f574f2048533440322dbf81b6ed87bd0052fbc03446003fea2effe552e25b35fccd4c15fd88ab1f6fe616de8c2e57
+EBUILD identicon-1.0.ebuild 801 BLAKE2B 1826e88de26e8a234578ebbae24267c8e89c72fdac54369a6deac108633d9fdab894dab369ef98918b8f4fb560d134f729d371086b02140b92b9c99a5fe9564b SHA512 3921d4b13baec634dfff87284ae83a001cd7ee0c527bbcbf58caf90c79f8c5c752e0b0cb284c58854387011daba802ab4db9041aa288dc7dc517394a7dd3baad
 MISC metadata.xml 585 BLAKE2B 74393a824ba5723f049b711324e847d8ded7cae93e6ea5c6d9abea51892d7b642f06bc125e0f0c8e54098103b5f7974c8c21f53f7c97be218604d818aa170f43 SHA512 9e61160b28b1a6e6e788acf51bcf164805e5f8e993f306eb8f4372f14cd9bc9e895a03fd831a93a6a408e2b0b321dfcc0a96b97b2933c8e12be5b213f44eb257
diff --git a/dev-java/identicon/identicon-1.0.ebuild b/dev-java/identicon/identicon-1.0.ebuild
index f7d56b315da9..3616ca9d833b 100644
--- a/dev-java/identicon/identicon-1.0.ebuild
+++ b/dev-java/identicon/identicon-1.0.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="Visual representation of a hash value"
 HOMEPAGE="https://github.com/PauloMigAlmeida/identicon"
 COMMIT="96902d3c7c9733d9da4cce9c5ed424557fc2ec3c"
 SRC_URI="https://github.com/PauloMigAlmeida/identicon/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}/core"
+
 LICENSE="MIT"
 SLOT="1"
 KEYWORDS="amd64 ~arm64"
@@ -29,7 +31,5 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}/${PN}-${COMMIT}/core"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="cache2k-api-2"
diff --git a/dev-java/jbcrypt/Manifest b/dev-java/jbcrypt/Manifest
index 3904de69b5bc..8102c7d7c301 100644
--- a/dev-java/jbcrypt/Manifest
+++ b/dev-java/jbcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST jBCrypt-0.4.tar.gz 15167 BLAKE2B 3b8acfb297bc5d412b3d8947a4c2868824d2bed7f7defef147cd1c6040d2ca0e6b97bcd05f1e4b3caf600ddf13cc27b962f30beb15d89e3981116b538609131c SHA512 2cc56a8c7642d9bc97f14b7b285011e0435290f4cadcef4df4e17566ac6801a406589ac6c84c0d0bf9a6e8e0b2835141c7bc9fea6bc36eb5f167682a658f4d64
-EBUILD jbcrypt-0.4.ebuild 665 BLAKE2B 2e801e872828184b3b6246033f78a8b48956a049ae7dbb844eab6baae0d67060fc189ebda3617f75992b00cb692254730eac8ac5c8ab64c62f0428c3abee00a4 SHA512 9fb99afa1f0b6bf469ca0cdce24ccbcad7327f978ba7836204d9c9f3d10b22eca76feb8ac32d2516ae84e875a9bc3993a799a7ad172628a3ec5ae2058d9a0e76
+EBUILD jbcrypt-0.4.ebuild 665 BLAKE2B 55990934416d53746ab2bc24e58737dac1b6815f2afdb9475c3997bfa24308698a6915927550279f3e06c3b4190f74fa34a0a0e2f7926c786dfaacb9251a6219 SHA512 eeaad9e1105476b125ed88774307c4a6c4eecf70ca65eae6cc3f2529ab538508b9a6c8b1dade825914a4bbd90b1c1e20d0beaf159c4160c2a1bfe6773827c587
 MISC metadata.xml 495 BLAKE2B b9eb07cd0e2d15d85597e0d4a5c7d94a8b20a0ba82b942569cd1c9ae543015baf1d3ca6bd27a3d2744cd8f1a4e50132da1eb6486b6d6caf5b470e9f919488307 SHA512 2cffa122bb06c6dc3d043db39ecd5aac18dc97bfb6a45dbf040812b02ff57e5c910143c8bdfc794d219f3a59c458da243853c1462f95810eba6728883ae66c28
diff --git a/dev-java/jbcrypt/jbcrypt-0.4.ebuild b/dev-java/jbcrypt/jbcrypt-0.4.ebuild
index 164af8eea9a8..cde1c1bd8355 100644
--- a/dev-java/jbcrypt/jbcrypt-0.4.ebuild
+++ b/dev-java/jbcrypt/jbcrypt-0.4.ebuild
@@ -10,8 +10,9 @@ JAVA_TESTING_FRAMEWORKS="junit"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of OpenBSD's Blowfish password hashing code"
-HOMEPAGE="https://www.mindrot.org/projects/jBCrypt"
+HOMEPAGE="https://www.mindrot.org/projects/jBCrypt/"
 SRC_URI="https://www.mindrot.org/files/jBCrypt/jBCrypt-${PV}.tar.gz"
+S="${WORKDIR}/jBCrypt-${PV}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
@@ -19,8 +20,6 @@ KEYWORDS="amd64 ~arm64"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/jBCrypt-${PV}"
-
 JAVA_SRC_DIR="src"
 JAVA_TEST_SRC_DIR="test"
 JAVA_TEST_GENTOO_CLASSPATH="junit"
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
index cf23e7a2ed1f..67f9fa658369 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1,5 +1,5 @@
 DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83
 DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B 25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b SHA512 4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21
-EBUILD json-smart-1.3.3.ebuild 667 BLAKE2B 03a750a6d9358cc734425d2b7aecf8213173033b4303aaf88c05400af59e1e5edf5e01433911fc660ed764d6b860b8ecf960be45cffa975a7ea678197d248197 SHA512 07dfd11d806c0978a4309e18f7145c80335532a8fc4bb77810f82284c1010ac8f0158e05f74a7ae28a4761a48cec64432fffd4359fc438e95322ae8d1ad97245
+EBUILD json-smart-1.3.3.ebuild 667 BLAKE2B 7c6299b11320c7095c955411b7c1264c88ccfec04a58e0c44d4ece8b149cbc847d7713214b5b91da27c102d8246d3be447b75f11588f61368bf725756f2b554d SHA512 c9667f022d0fa9d2164a9f5823763e84e412d200f09ca075f63ae0038cdf4726d4f0e1b6f3e6b62677d4f0a27e0ea3f1fc921b13c51fedbfb5dd8f80fa6cbdfd
 EBUILD json-smart-2.5.0.ebuild 1622 BLAKE2B 0548fe28848155e798ae793d1b55f628a360d8712891c08318bdcbce27a2bd00186bc95290be0c8c29ced3d3b3a9946b2a1fcff38cf9e3f43ec46eff431e6361 SHA512 13c7c1e183a0d8d46949e1dc328f9aa2292a22f8b4d9c6ca6a97a8c1e2980225a0a53fd2f00cc1dee9cf758bd51da37368173c3647326d489ad1145ea2b072d1
 MISC metadata.xml 642 BLAKE2B c365803a643b02f870ff0658d1184c227a243f1d9801ddfa9f5c487412f390a4714b75f461ad5b4acf589da5f0201df19e10126c5ccd2a2685c77edd5c774765 SHA512 f28271bf046bdcec40f7c8fa824d8eaf0d222c082412c08f9e9f3a766769d8c5c29e32cb4136f0722ae4400ce9fbf28776880c0d10903ccabe2a1d6953cee3ac
diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild b/dev-java/json-smart/json-smart-1.3.3.ebuild
index 1bf1ce4edfba..1edda64d3342 100644
--- a/dev-java/json-smart/json-smart-1.3.3.ebuild
+++ b/dev-java/json-smart/json-smart-1.3.3.ebuild
@@ -12,6 +12,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="old JSON parser"
 HOMEPAGE="https://urielch.github.io"
 SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v1-${PV}/json-smart"
+
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm64"
@@ -19,8 +21,6 @@ KEYWORDS="amd64 ~arm64"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${PN}-v1-${PV}/json-smart"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-java/jsonrpc2-base/Manifest b/dev-java/jsonrpc2-base/Manifest
index e24ff4f4e16b..706d98961aed 100644
--- a/dev-java/jsonrpc2-base/Manifest
+++ b/dev-java/jsonrpc2-base/Manifest
@@ -1,3 +1,3 @@
 DIST jsonrpc2-base-1.38.2.tar.bz2 31673 BLAKE2B e7ee637f4794f9c0c8e80824200976b8bdb762d14c0d0716bf60e840cc166c8be5794e186294072eb14543f04d37b342f74308b30f9477f066b9785ea94c38b1 SHA512 8084730e36e30d950a57ed6ae6cbe8bb4e5719e428881e394450a5811faa97b33d63991c5f12cb8d17896ead507f96917568881e9923676a942ac229ef146934
-EBUILD jsonrpc2-base-1.38.2.ebuild 942 BLAKE2B c4d3a48098b481973e6d6d0635a59c9428702fc9c048c0f26c11d88b0720143b3c5ac8af0bf2731b898baa57463bca73c3e3ea057c51d0ee2ba02c8044c9ca97 SHA512 a02cb16fc485c5cb5ecb3402c2f932ecfbf56f9a898f9e3d4a273cf556eeadfad79540738b039e2f86ddbedbe348f3d49bba3f80429ea120027f3b790569a381
+EBUILD jsonrpc2-base-1.38.2.ebuild 942 BLAKE2B 3ed112e8353ed9f8400c940ec0c26705ff2ef26014c9b26873ef456b0fda9f3265be6b3d98510eafb3d05f2959a63341d1f22f0e544df320137dbf1341233b3e SHA512 347410e57d90b84003a1a71f9101bee65a297de461258a31fbdb8f39a99fd8cdf325b29680019b50610d92219881e6a2d743c0073717a680e4b412833d2ef9a5
 MISC metadata.xml 602 BLAKE2B a42abe43e6f06113b101bf50ad90499489cfb590d28b506e03151bb9a3ccca410f61e818a44e9f85819f5928ea9cb03a53e0af3caa9162c637a92417e04b11b1 SHA512 0bfb5589c98fa4934d785810a3bfce82de1cf5b80336cfd80f94ff71153738ffd87f6a26b671fc08657c96fb0ce58106712824a179fbe4ab0ec79ade4d7d50ce
diff --git a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild
index 883446a934e5..f35f32dd2946 100644
--- a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild
+++ b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild
@@ -12,6 +12,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Represent, parse and serialise JSON-RPC 2.0 messages"
 HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-base.html"
 SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-base/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-base-75e66af02953"
+
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm64"
@@ -27,8 +29,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-base-75e66af02953"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-java/jsonrpc2-server/Manifest b/dev-java/jsonrpc2-server/Manifest
index 8e571f3795e7..f335e816b2c2 100644
--- a/dev-java/jsonrpc2-server/Manifest
+++ b/dev-java/jsonrpc2-server/Manifest
@@ -1,3 +1,3 @@
 DIST jsonrpc2-server-1.11.1.tar.bz2 12155 BLAKE2B 5bf0140a45cfe51e9aedff49c881ab9a98a35599d8dc564d6a0d7b77bb3fe252edf93e75ebd7f4dfb9573e0adf71416174e170c3d79d32f626edccc7bdc103d1 SHA512 637f07d51abb86d0febe170856ba8b3ca39b885ac9f2525033beee57d8db8704a48857cab4f434f2638e8c61defaed857c6ca65a41e93392d13975a4a44f3f2f
-EBUILD jsonrpc2-server-1.11.1.ebuild 1190 BLAKE2B 380fc394607029e0fce22ea60dcb2ededecde4a4719ed3e0f98b25313924a30398591f6a8cea0791a6341120b3a6ea47f0ea706b8a41682d1256558c5e6eb381 SHA512 8b10f9467fe10424d3683be21279b59713958f150993368a8e2d012f578770d8fd841362b8962e5c511a541723ec013f33dc466d59596fbc62025bc6f2b75e63
+EBUILD jsonrpc2-server-1.11.1.ebuild 1190 BLAKE2B e038e8f3706a7603eba64416816a4448ed9f55e1e72f2dd833d551e3efd3e2149633cbbc2e23984fc455d67fbc9f2a21e7bddd070272019b28c223421f3652cc SHA512 05412e140ea21e2abe9484331f183e2101c260f4cdd61abe44788c039e7646e55c0feade8bf23fc37c6a782cd16688abd0251627c3ad6dc20e39ea2e60f4e82c
 MISC metadata.xml 604 BLAKE2B 4d777eea3763a19c42ea44759618d2229b9362c2f4fef107bde946731b365cc5e9018b2e592081dc74b6744ad49a5d7d9e088be97c7c80c5ceda8c3f9f5e4ab5 SHA512 3dc08c3b370e0ceb10277c0d32f269af945b8a36f9238ea1b86aa4b6f1df37dde93207a16f6e09b758e9f35ca2709ccd5c14f80286d9b68edd20db6ab9a208ca
diff --git a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild
index 819ab21078c2..1543308315e7 100644
--- a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild
+++ b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild
@@ -12,6 +12,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Server framework for processing JSON-RPC 2.0 messages"
 HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-server.html"
 SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-server/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-server-40234a8c2029"
+
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm64"
@@ -35,8 +37,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-server-40234a8c2029"
-
 JAVA_CLASSPATH_EXTRA="javax-servlet-api-3.0"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/minidns-core/Manifest b/dev-java/minidns-core/Manifest
index 4ac99257e85e..e2961ce4c0d9 100644
--- a/dev-java/minidns-core/Manifest
+++ b/dev-java/minidns-core/Manifest
@@ -1,3 +1,3 @@
 DIST minidns-core-1.0.4.tar.gz 160110 BLAKE2B 5465a4f94ef98966ddf54633fe23a8f5a567aad5b059030e204e495e8bcc9ba3aa6e32b2a45be53d0d0df18edf4731e2cc1b163fadb7b8cbbddb259848b022ef SHA512 21a6065b2de3e5ec0cb3da8f68e655e2b72424472186256fc29b3e51303b3bf6f3b1c9d0a106968b21ba55656ea9ef9e90d51cee23eea8d865e11dc2f4d5c2b3
-EBUILD minidns-core-1.0.4.ebuild 713 BLAKE2B a34bdf77e2bfea6ebd565e0552222b0db0d3ac9fde2157856e753cb16fba784d485ea772dc96eca4868151dff740f784cbaa21a6e9c2766c7178e7c0fe271f16 SHA512 7d391044b27ea7b42cf8377e734fadceadf5f90727bd189caaaa4ac183d7bc2ed0dbe0b46dae3c07f8092a07986c228384b1aa629daaeb5a3111decbf6b16e7c
+EBUILD minidns-core-1.0.4.ebuild 713 BLAKE2B 536fe5e358aed9bde57eb88e40da42ce5cd1578efda07a99aea5fb9e21f8aefc68f2bf9d544a9bc84929ad9915af30d5997f283b32776ee748c14407c8b05c58 SHA512 868e20cc1830ffe3593f3afc988667abe2c9202e3b16e2f1eea80a2764234b2759a01e650d02c4881cd86e697e159b8214f8c8acc739e4fea35a57b0b9895083
 MISC metadata.xml 575 BLAKE2B 60068d208d484bd19dd66c43db032dc5e45c4051a95d4a154e1f5ea7fd2f2fadbee4b26f2863038cabd511501992b313e755dc23723976470ae686309b323883 SHA512 ded64c7e30af4395c32380c131f42cd2ae644c9e067110ec4bee309e2c08129f00556797fd82d082d0aa53ce0bc29dd155560b683f39fd774773bc2e44121ec5
diff --git a/dev-java/minidns-core/minidns-core-1.0.4.ebuild b/dev-java/minidns-core/minidns-core-1.0.4.ebuild
index 7e7c891f7e6c..480941460422 100644
--- a/dev-java/minidns-core/minidns-core-1.0.4.ebuild
+++ b/dev-java/minidns-core/minidns-core-1.0.4.ebuild
@@ -11,6 +11,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="DNS library for Java and Android systems"
 HOMEPAGE="https://github.com/minidns/minidns"
 SRC_URI="https://github.com/MiniDNS/minidns/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/minidns-${PV}/${PN}"
+
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm64"
@@ -18,8 +20,6 @@ KEYWORDS="amd64 ~arm64"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/minidns-${PV}/${PN}"
-
 JAVA_SRC_DIR="src/main/java"
 # needs junit:5
 #JAVA_TESTING_FRAMEWORKS="junit-5"
diff --git a/dev-java/zxing-core/Manifest b/dev-java/zxing-core/Manifest
index 9679383ac7e8..cbd051064133 100644
--- a/dev-java/zxing-core/Manifest
+++ b/dev-java/zxing-core/Manifest
@@ -1,3 +1,3 @@
 DIST zxing-3.5.1.tar.gz 132915650 BLAKE2B f749de7db35f3ce56d80fb1aa547e65d57425a1d1e20dfd9b40e02e24c52e6f488ca26bf8e0217b7d65677441578bf67439ad3a1fca3155ab35598b6d9833ece SHA512 8c093e5b8e4d2cd01e8979b5e9f788ac32a8d0bb49f3c7ad42044e95bb4a352e66e2802f11ad7429ed6ba140b360c596f389cd721521b84a5a93918df19285de
-EBUILD zxing-core-3.5.1.ebuild 896 BLAKE2B bd41d6c6704183662ccc74b759656ae1866427e2bfa0eccefe87592480fefa364b3170233450d1702df9d8a84df395c15dfcf70bf7e4cf930fdfcce1494d4def SHA512 f2c6af0579bc9f7f73759a0d1e6f4fdf387e45effe410a4febceaea36bf68ece48e6a9d25f1fd83efaa8093e16b098d3f808ede1531fc5adeea70681b2189fcb
+EBUILD zxing-core-3.5.1.ebuild 891 BLAKE2B 471f6a016ac6cbffb3fdba29963639da11c9cc75f0ffd6864e033234929520ef87dcbc5bf6067989e30d074e80f91b67937728b26757fe598325c15254d60c81 SHA512 6c2c37a94f89c72eca39988e484bef15aa55262e2bf701cc0a8cfbd924422533383c076a578aa7ce4cdfbfb5c4f8c1b28eae6e54e90889f1b6e377275c5c6550
 MISC metadata.xml 571 BLAKE2B 12b2e08bfaeadf4c0575f5a59b56761ca58067fd9ac353171301afce6d380964f9ff411678caee8eb50cbeb5fc66f98c5d8f7b184f8295a242e7a8f7f5f97e7f SHA512 6728b47f22d36df32848eaa681cb94e51162b369cfbd5de0f9985422c70a35ef65213a8dfb02761ee51e4477cbcd6d3d064871e9a27fec496724ce2678d5c23a
diff --git a/dev-java/zxing-core/zxing-core-3.5.1.ebuild b/dev-java/zxing-core/zxing-core-3.5.1.ebuild
index 8fa97355fd36..bed08de3bc7c 100644
--- a/dev-java/zxing-core/zxing-core-3.5.1.ebuild
+++ b/dev-java/zxing-core/zxing-core-3.5.1.ebuild
@@ -10,8 +10,10 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core barcode encoding/decoding library"
-HOMEPAGE="https://github.com/zxing/zxing/core"
+HOMEPAGE="https://zxing.github.io/zxing/"
 SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"
+S="${WORKDIR}/zxing-zxing-${PV}/core"
+
 LICENSE="Apache-2.0"
 SLOT="3"
 KEYWORDS="amd64 ~arm64"
@@ -19,8 +21,6 @@ KEYWORDS="amd64 ~arm64"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/zxing-zxing-${PV}/core"
-
 JAVA_AUTOMATIC_MODULE_NAME="com.google.zxing"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-java/zxing-javase/Manifest b/dev-java/zxing-javase/Manifest
index 2ec5562945b9..b71fb1a9dfa4 100644
--- a/dev-java/zxing-javase/Manifest
+++ b/dev-java/zxing-javase/Manifest
@@ -1,4 +1,4 @@
 AUX 3.5.1-test-available-formats.patch 1070 BLAKE2B 6c5e38e4db4cb8399648ad2669bb34ced17e010bd309ff5dd359dd8315df12a116ec35b0db6555c63562e329e9d72078f1de17b87830d1e6fc2c90a535f22849 SHA512 7e44f569b354f1bb7fba815483edc67623a45c5f0cab300729db3d0193c06642343915554e31265509a0f20148d527346393058518245ecefd710e5adb0390fc
 DIST zxing-3.5.1.tar.gz 132915650 BLAKE2B f749de7db35f3ce56d80fb1aa547e65d57425a1d1e20dfd9b40e02e24c52e6f488ca26bf8e0217b7d65677441578bf67439ad3a1fca3155ab35598b6d9833ece SHA512 8c093e5b8e4d2cd01e8979b5e9f788ac32a8d0bb49f3c7ad42044e95bb4a352e66e2802f11ad7429ed6ba140b360c596f389cd721521b84a5a93918df19285de
-EBUILD zxing-javase-3.5.1.ebuild 954 BLAKE2B cfa4813170ab2393d106eb7711ffa232db222b48b00c515ca6a740d3f7ba482cbb7ecf869268b10c955e91ace8bbcdb3e5dea56c0bcee85be44411a6bcbeda17 SHA512 b3240602d1b4a3b6f415c10df529ef175abb26b0d3e62a46d2184da13e7b240bd8a82734425d6458b7b785e7be84ad932a21ba972bbcb316cd696f4a68a9aacb
+EBUILD zxing-javase-3.5.1.ebuild 954 BLAKE2B b92f49fe9554031b8ca1c844b5bff3a12eea4341cab3024088036c847acd268eedb0c96afb7c170ee46231b4ee961622f61739d90848ca499982b3491c958a60 SHA512 973d6308e0315c00c69c489304378a7b967cc9a12272ca96302e86bc2857a855936d8cb2ad7453cb41c59b7bb48767cb29e99f983eb588a0f8b0f365b6caacf9
 MISC metadata.xml 571 BLAKE2B 12b2e08bfaeadf4c0575f5a59b56761ca58067fd9ac353171301afce6d380964f9ff411678caee8eb50cbeb5fc66f98c5d8f7b184f8295a242e7a8f7f5f97e7f SHA512 6728b47f22d36df32848eaa681cb94e51162b369cfbd5de0f9985422c70a35ef65213a8dfb02761ee51e4477cbcd6d3d064871e9a27fec496724ce2678d5c23a
diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
index 0240cfbf5268..3a079df3037a 100644
--- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
+++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
@@ -10,8 +10,10 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core barcode encoding/decoding library"
-HOMEPAGE="https://github.com/zxing/zxing"
+HOMEPAGE="https://zxing.github.io/zxing/"
 SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"
+S="${WORKDIR}/zxing-zxing-${PV}/javase"
+
 LICENSE="Apache-2.0"
 SLOT="3"
 KEYWORDS="amd64 ~arm64"
@@ -29,8 +31,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}/zxing-zxing-${PV}/javase"
-
 PATCHES=(
 	"${FILESDIR}/${PV}-test-available-formats.patch"
 )