gentoo auto-resync : 28:07:2022 - 15:04:40

31 files changed, 259 insertions, 120 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5f3f64ce0f47..276a61296c9c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/apiguardian-api/Manifest b/dev-java/apiguardian-api/Manifest
index 683cf4495ef5..5c2a51e38896 100644
--- a/dev-java/apiguardian-api/Manifest
+++ b/dev-java/apiguardian-api/Manifest
@@ -1,3 +1,4 @@
 DIST apiguardian-api-1.1.2.tar.gz 67267 BLAKE2B 27bbe157f23c0904863d093930968854771f4c6b1bc6b6a6e6b86604383abd291348fa8b009d760b3bc739bbfbdb74e9429942ce1acf4bfc52e29e79386f2059 SHA512 7c56ee15e0aba07e95b6f2fe7cedd98e449e774958eb63b2467066c381e1e82ad67c982c2885e18154c62e55fda80a1c2e0f689253afe449db9f7e7563122db6
+EBUILD apiguardian-api-1.1.2-r1.ebuild 646 BLAKE2B 6b2208bd208b1ceae7cf0dec401f670ddee283d365f7915d0e5efd05fe28aa3400df8e3cb3395cd6fd938de445399d068d11990d9c723433825a3a9410954d92 SHA512 964a534c18c7792ecfee0f4cc4129b3ef4d93c962fbd90d9e0790962d28924014b10f9542da77cc296737214c0bb14db05306e122357dd636878b3e3f07bc6c5
 EBUILD apiguardian-api-1.1.2.ebuild 760 BLAKE2B bff17e704af6674b3fc6ae6f5fc694f7d3de3b0df3edf1a5bc154012f8c15ae0c238e910c9da0e32fbed10d8d03c459b9a88102d1d2ddb5f77914ebf9f668b0a SHA512 ca5dd36c585792d4ae9230996a1b6f2ae138457d53dd974e34b0b59b39fc94edabd22d07f4877cf30d6f9ac36a3026d6f34d64082be22842b0d9a031b8c32a53
 MISC metadata.xml 630 BLAKE2B 4d001de91a36f097a4a939e959ef99d68374661bf7ee8ecbbe53cf6c4802eb4de781b2410e0e9e0a33e17ed1647a02094561ab6f95b8140b9e0b60824e71251f SHA512 6b327e02c57224a464bde643b82b385a4ef874cddd1c61cb0d7bdfbd4ef98c8a3dd0c150d02998ad1189f194713e2f0d1b1738fffe63f84070d1aa6eb8df140e
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..53885481c686
--- /dev/null
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apiguardian:apiguardian-api:1.1.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="@org.apiguardian.api.API Java annotation provider"
+HOMEPAGE="https://github.com/apiguardian-team/apiguardian"
+SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN%-api}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
diff --git a/dev-java/conversant-disruptor/Manifest b/dev-java/conversant-disruptor/Manifest
index 3fcc71512222..0f96e41aee4c 100644
--- a/dev-java/conversant-disruptor/Manifest
+++ b/dev-java/conversant-disruptor/Manifest
@@ -1,5 +1,5 @@
 DIST conversant-disruptor-1.2.19.tar.gz 171364 BLAKE2B 2ac7a42835f22ae7361f156b9cb9853cea39b757c9869847b9b4c526e3e04e46ae8b7ca90c1c38bd3fa57f6925bfc95767235fb4640e7ecf1e62044973b53932 SHA512 f475507e2ab2e4260ec04b699c42115fa917f3df9dc67bbf944c96441e58fff1ab8ba63beb97dbc77d3b76f65b6b116d84b17a1eb4b40d58dedbc029e81e39ee
 DIST conversant-disruptor-1.2.20.tar.gz 171469 BLAKE2B 5c43a5ffad0dacf07605cab6bba2ab1d44f7204d1e24405a4f8f8b09a3edbee79bc5ae4ba28a0a8cb1440db15b6ec0143e3348c0ff42b4256c1267e87d36fefc SHA512 1e483642213a3780d24cd7b801d6d5d274df9bac075f88bdfc8026173d87e4b332e7cb6c174dc804d27670b89dc9abab3a6f93b663dfbbb3ecc4631266351f0f
 EBUILD conversant-disruptor-1.2.19-r1.ebuild 1291 BLAKE2B 2bc5ca4d984836415961f6060911a76e0bf3fb11347d4076726c5f55eab5abdb524b7116f7dca48a4f5d7333b76d9c76a635e769e7c548ba196aa1d2ad18e5e2 SHA512 089076214d1aace12c37068bb9e6ecea208a2642786fffb9ef05f0b26712af564a990d5b168eeaf371b18caeedf93f855c626ca61a172fc7bd9eafe86180ece7
-EBUILD conversant-disruptor-1.2.20.ebuild 1726 BLAKE2B 5e93124bd32436089cb5a202c93fabc5a36cdabe6889a8de90509c570abf45f4004eed3bad7f717b646922697e783cd73058eb02bb4faa74a7ab11f78b19d8af SHA512 68d50c40ef70769fcae0337bb06157a28782f98df91971b33f9f41ac2c2b61feabeea5b2309915c99dc8b5b813f53fe47be5b7558281a1d04cb1cf71d874831e
+EBUILD conversant-disruptor-1.2.20.ebuild 1725 BLAKE2B cbff1b690eb42d9c82239d1b756637276e65e88e051eea0911fb1141f74ad03f21be64a621df3bf269fe15b71bf2984b8c10a02031806c109508c372b14a7176 SHA512 1f40bb5a09471aa0becfa5faf832c25414df57bfd34c567453f0b7908afe349dc218e7860b18b61fe2cec7de313968ff964b9d170680e8d9cd88fb23a19c9175
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
index d1a64019a1a5..3eab6e27b7c6 100644
--- a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/conversant/disruptor/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 9288b91dfa79..c2ab2c5713e4 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -2,4 +2,5 @@ DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d420
 DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
 EBUILD gson-2.8.8-r1.ebuild 1745 BLAKE2B 6df1694112b6a71a33b7e96cb84d227cd96a69e6f55c3a964e3f4cbb585e96f9f457900e47260fb8204e7bdaf5e771f4dd9833090e9f22a63388e224e9fb4d7f SHA512 af2f7b14c43f914a91ab4285c1f702388fc45d9d78bcf9fdb65b918436bc4cfda135269168255df20813c24cfa32c38ec4eabf5a49fc6e22b2c6cd6e5bc3c063
 EBUILD gson-2.9.0-r1.ebuild 2095 BLAKE2B 71415fd6ec715372eddec83dd7ee27e84ba2bbf06d9e0cd206d3ebbccbcd8c90ea310befb4730da41a495609903049aef94bbd0d24125a6c0cc3e7f37b31f34a SHA512 217c6663d07526a44e9c23ffee344c3fd87653da8c14b359f7bb927eb78e564071c7678e55bf28c6b6baf4f019c2046365fffa1041d022c67af1814b71b98436
+EBUILD gson-2.9.0-r2.ebuild 2060 BLAKE2B beda8028f1e6779345dac9e6ba2a7bb80f7ce188425f29f45c9caf673e6e7170c65dbc15691b5fa8433fb582b40d075b6c9711f7f94a2ffa6cd8bc47bb123123 SHA512 a5e874d6a35b5c5006128f94573087972b292229335a4944b0c12fade665fd9dd50b52ddf94a354acd5df4604fd34edb977db1501db699306c972b848e0adf5c
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.9.0-r2.ebuild b/dev-java/gson/gson-2.9.0-r2.ebuild
new file mode 100644
index 000000000000..c5ddf82b4f07
--- /dev/null
+++ b/dev-java/gson/gson-2.9.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.code.gson:gson:2.9.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Gson JSON library"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-templates"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# requires the test class to be obfuscated using proguard which we do not have atm
+	"com.google.gson.functional.EnumWithObfuscatedTest"
+	# FAILURES!!!
+	# Tests run: 1090,  Failures: 3
+	# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
+	# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
+	"com.google.gson.regression.OSGiTest"
+	# testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest)
+	# java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $
+	"com.google.gson.functional.ReflectionAccessTest"
+)
+
+src_prepare() {
+	default
+	sed -e "s/\${project.version}/${PV}/g" \
+		-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
+			|| die "Failed to set version"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXCLUDES+=( "com.google.gson.internal.bind.DefaultDateTypeAdapterTest" )
+	fi
+}
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index f13b597e3def..933b3c8e2fbd 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,4 +1,4 @@
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
-EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3894 BLAKE2B 98bfaefd488b79652811b2d178b4270ed7d4b8dc4699812c45e5d131c8ebc5efe347c013635d40b0bfb063eecffba38b44ea4efe9168345ee6628d919146cf05 SHA512 9d2241f0579663bbdc54121f97f0b2b448bbed4e352ab011b998bb5cfa7be77208ff6dca5aabf21991d01197ed45abc6844c1d2d90db618eaef97f34b8a5a252
+EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3893 BLAKE2B 01daad9c62aa48a4ed76d3aecfd1d7441ca7dc0fd1b3799b061d1543c94862e2d7db5bafde63bbfff440deaea0b1fd6290aa7e8b62316b274fcf9eb793123e4a SHA512 e530cc68f4066d650618ea2ffa95f4373e6c7bbd617861d62356a344984f33f5fe8cc2563976f371ea543d5c8e4cd14478a62d41e19249c4326138f5d42a5611
 EBUILD jackson-dataformat-xml-2.13.3.ebuild 3892 BLAKE2B 46afcafa1c09722bd77b5c7bbc33c586deb219c9f35c561efe50067a6fac3e580c3c0c5f6678dd3052b2e3048055fd55e4e062b1b44beacc9a0a05e9cb33f060 SHA512 56f33b35d344dace59ceefbb25a14059f5dfe90723695066b300b0cb1b997a6d86258b3d869238a604a6f1d352aecdbdc9fec6b6b3c742b9e48070f55b44839d
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
index 29b7b589ba08..ef3a1fa5a48c 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 379d33ddfbfb..82a28a0ba684 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,3 +1,4 @@
 DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
+EBUILD jackson-dataformat-yaml-2.13.3-r1.ebuild 2210 BLAKE2B 167e2de164641470eec968fa0b7ed7f410a763e1c3a6bc9fb77e532983e58f0533fad46f26ec8af059c4f277da80f88843beb6365c352edfcfdfaba327292ea6 SHA512 f3c2cb72edc6b40ef648dcbf6a16ea128494ac143a203cdafe599db38df732706141565525339f9d0117b82a0a3ab97e7453754016922d88f212a58f4637aa32
 EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2662 BLAKE2B 377c33938b5dbb8cefdeb46b5d3bd609cce89cf2e5a140a11087f941085ad97ded9436c7ba30e1680c3edccc79bff51e95e29d71ca664a470e4b8c9bfb8ed0a8 SHA512 f5c29bad8fc54a83f43baee06627b3259d3d0fdcadd1d3a6eebf56cb4905e4e9e1510e853d4c60e3772aaeeffdc5009cf181aad69def21dc7d6d5a4c810e990a
 MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild
new file mode 100644
index 000000000000..530150c4744a
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
+SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	>=dev-java/snakeyaml-1.30-r1:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( README.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
+
+JAVA_CLASSPATH_EXTRA="jackson-core,jackson-databind,snakeyaml"
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXCLUDES=(
+	# Upstream's usual exclude pattern: "**/failing**/*.java"
+	com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
+	com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
+	com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
+)
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
+}
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 31aee7582a50..b27bb6303cf2 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -3,5 +3,5 @@ DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72
 DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
 EBUILD jaxb-api-2.3.3-r1.ebuild 1531 BLAKE2B 8c3fe2631bb4c08cec81d96f8ae1a632740eee3e822e5ba16d703f8f792e594834175d2681eeedc28647d5c3f49947fc405bc57b915441203bb113419f31d948 SHA512 90a9f418a8c15a21d88076370bda6b757648fdfbbcd9c1eaf137de7f0d72d0aff7f6b326919f0f14f668e006d28c0a9fc0b60f594b252050f9032f681b1767f6
 EBUILD jaxb-api-3.0.1-r1.ebuild 1116 BLAKE2B 0699bde40ccb4198c76f1df7c6de9be8e4f7d555a66e733c05d5942677cb208598b47aa73f2a3691a3b5c5ef6c19ff5e9e37135eb648f87628b39a6e11ed1138 SHA512 d93aba658f98491ba3d9f8d6a24fc1831848096f93ea5c6500dbac61b431087eedb18c16e943a43bd26846e8bb45e1ae5f7dfcbbdf87b146c869cdcda83e0dc3
-EBUILD jaxb-api-4.0.0.ebuild 1020 BLAKE2B 507345146780d83cbc2e63c30e80445eecdab14128735891fe1b42d23e4e5c8d875db3286797350f494c842f90a691fb738c028b57020e74ebf4bec3c097252e SHA512 edd6330874b769377b62541ec5ac9343ecbb9b4d2c77f1918220286286a3b101f0f67b3698da145b9cfca0796982d944bb384ca1af0785cd7bb1055e27e306d1
+EBUILD jaxb-api-4.0.0.ebuild 1019 BLAKE2B 5af3e9bd162832e5fa1551189d37956a156d01ea50bb8a9a52622b0a351d409d5b180c03c015c2874d7fc69713d6b154b7e4f80f5ef55c20b98376d32725ac7b SHA512 771709059d8620ac3b20a66bc3db5b3ca5495e8888a8854ed3aeb734fea061acd7a196b25f524ac95a3df3b151ad44683f6447b53e942ac2d24c21f695702513
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
index d1c7e6079db6..db9d29efcd5b 100644
--- a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/jakarta-activation:2"
 
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 06025340ab50..b42e9419b09c 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -2,6 +2,6 @@ DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf2
 DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
 DIST jctools-core-2.0.2.tar.gz 4136573 BLAKE2B 6ca4c276422b24b18256b35606b6e59e8be53b77fe0b757e4f46dc4e0bdab0ea8fbb8c58e84794c689aa1df29a80aa847b6baf7cda430f2657720ecb5d60e99f SHA512 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f
 EBUILD jctools-core-2.0.2.ebuild 2134 BLAKE2B 394965b73740c75bf5578c02fdc035efa3e719501fa7452ae6da7e0d51bb11994def69e379623900c315de47a4e8147d1dd5cc6acaccda5b2188c174fb115f9d SHA512 6e5f6f1514a9bdbdff75dba29ca34553dd2d781c134579670195edbc70d702d34411b069ef353d81390dba47f23b81bfc960ca973b9eb75de68ba2ddd8d56695
-EBUILD jctools-core-3.1.0.ebuild 2188 BLAKE2B 9a7a615f44eaddaee9a93bfec26deae11e8d34efde6ad0ba84853c27efc153ce492c352efabc41084b664d999292a398e1bd477440537ecb5a2da203786fbcdf SHA512 2520eda1c5ee1c223417c61bbaecd5602b4fd07c1d29d664d2e91617793f0fe8e8bcdf83867aaf95be0f9ccfed35bbfb2aa5b589e15e40d8ec5e3265b98949c1
+EBUILD jctools-core-3.1.0.ebuild 2187 BLAKE2B e5968a8f18faeaedea61a9696e9e09cb7d7c0c4381365a898cfe3501d9b6ca0fbd7b675e45451e8e0a586913a6d99c6c06ebd50318692cb9bb0a086a21845289 SHA512 31e5ef371dffb46f3efbba06a2ef2d7b21749d82761c0d7503206e6cf8ed923eae5a48b471112056071edf991aa23905732ac7cce19dfe8916436d57e9fb3bdd
 EBUILD jctools-core-3.3.0.ebuild 1997 BLAKE2B 02c25bc251787f5b99e4ac4ed460e0875d187a388929ba42a522f491e6948110cb4788b969dd9af94e11679b8368188cc4c7fc3777554764ad0dcb3bead1630d SHA512 020fae13b989f623b512f42a51050279ef056a5d65defcddf7e80edfc47dec5e6e45a1ebfbbf4db6bbaef590b853678f14de6e3233cc42640e3ef928170ef2db
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-3.1.0.ebuild b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
index f1b6220aceac..9b473b907abc 100644
--- a/dev-java/jctools-core/jctools-core-3.1.0.ebuild
+++ b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${P
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 066ad9d87779..b36f96547abc 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -2,6 +2,6 @@ AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 BLAKE2B f358ab6ac9296ade9eb
 AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 BLAKE2B 243b64279b501b417a5570d41010decd4edb55ca11a14c1a927698ee3795b2d7e7fc9c5c6fcd95b6210bd26c3938795fcbbce1b1c4dafe259197b0db8eb60701 SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6
 DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
 DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
-EBUILD jdbc-postgresql-42.4.0.ebuild 2020 BLAKE2B 52ed28f9a94961914650109620db20fa0f681d7c8df90095772449dbb78bc7988bee8a2a4e9828320b5976bbcf7260798a94152e56d63d2bbb3931486383e739 SHA512 ef0fd49fa850ca155c958f48f050dc4e54e9866ad28f88ae0b5825655d26b682b58a725af91f7dc28d7d77dce7e5d05adfc7178ef3ba6dc3dfd24564c21b1fd1
+EBUILD jdbc-postgresql-42.4.0.ebuild 2019 BLAKE2B 6b0ebf8b68d03d0adaa6cf3764b9ea65225b33f6d2538f45a02f620d7d4e0bc1f957e923609bb3bef17ed0b69d64c1fddd9bd9751d99e9b6756e50dc7f2f1d2f SHA512 9b9dfeb0b2afea956039c6677e1479e8837b9244607b6731ac3381815991a3035e53518a9ce9ea316a0913385a19df89aaa8382c533b8309ffeb179dfd9ea09f
 EBUILD jdbc-postgresql-9.4_p1206-r1.ebuild 3412 BLAKE2B 96f494807dcc52edbe1475d49af9a951873ad01647f44132ae0c370d84b9cd623091a2177ed99d25dec3a78252ea57c1e31b98da68ba6eb9e301cd2e8ea319b7 SHA512 bd1a037439f9e6995fe525a5a5ee6b2f89ff727e1741c92d9798676960aa6777c1d80d0046cac6557291a700c6a10c9de46729b0f878f20af5d55aac19d274e4
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
index 3790dc834c3c..37557d8f291b 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index c218d04e3bb7..2cd1a6f1bff7 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,6 +1,6 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
-EBUILD log4j-core-2.17.2-r1.ebuild 8552 BLAKE2B c7166f27fa4839a333a0426e03c5307cfa0ab890898b95e1a6149c4ed699c1deacc13fb33af17ea067b21e357581cad8a53df9d500e51f9e07143bd70bc5ae1e SHA512 2470657a506506eec3d075f7f6ab202d1c2b2aba9eafba8326b50165f95e1ee1c9802681b3f1477406598101570e34dea4fb0f044a443ecaefe53034826b7223
+EBUILD log4j-core-2.17.2-r1.ebuild 8551 BLAKE2B 033df4fba814cbe20891a958d7c410f2fb317eaf154db4f519983e615b0ed1f24f808be64323160557038763809b0a5492854ab329e4c6869e11def72ad459b6 SHA512 f0cefc0609e17ec8b877aca957d1e29f62e8373bb43e3bf4c4f8d8f2882960b0f48700f43c7ed9e2e21603ec0d7101bf351fd830f57f164cb283f18ea67bc497
 EBUILD log4j-core-2.17.2.ebuild 8550 BLAKE2B 429e7da14c9aef21fb613522f9a240ae9f731f776a5c1c0b894da7b8f3176f6d7c0ec0dd83ff63c66520e4ecf0c1511bbf94ce58a979fb71f4aa5b4bec262903 SHA512 a13d5761ceabf1c307f82f715e9c71ba2d68135859fdc5c3419e572d2ca293f0c2bf1efbc61b0a0d55dc054b60678d9f1c9b79cf29cb668b7eb187b137036dc6
 EBUILD log4j-core-2.18.0.ebuild 8539 BLAKE2B 6675a0dfe0463d16058f52eb9715ff4f5535156f8c66df0b8c63c5c44b429a6e109779196759136a93c4d1dff0938e68b84251289cef9599314a4f49c2ecf479 SHA512 0ef6883a0b7a8526408537b57fad56d4bed7bcf21448979ea36572953fd4c72d17f5aa2b7ba335878f9fb8ee10caefdf75f22355757a032e95654fc15b32eacd
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
index 135eaa02b35b..14d277adefea 100644
--- a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest
index dda0994c2aca..970ef3822781 100644
--- a/dev-java/netty/Manifest
+++ b/dev-java/netty/Manifest
@@ -1,4 +1,4 @@
 DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca
-EBUILD netty-4.1.35-r1.ebuild 5855 BLAKE2B 4cf4125df10febf226354f4c85ec9a512adf91c5a160306a8bdb62b18389e257ea24309b61c7cb77058b939ec6b2992bb6f6c9588a06de41219e68c1f95b1e00 SHA512 22368df638a416449b77405f15b1b959e8544b9ba3fa5c13201cb6bac1db2bfdf4367623d63579d5fbc69e2261f3d2bdacd4ae61e63c07131f076f7b49849226
+EBUILD netty-4.1.35-r1.ebuild 5854 BLAKE2B 5f8369d88576edbd227b534cd0061e54f8c88a2215dbd245a5bb61040e9e9969103f044a3db043e4bef03b61094693ab237b63d29fdcdb31a5438a4a457415f9 SHA512 33daed407d71ae527b2ab10945126710916f140887e39a3c8575ae37e85aa445d70ffd08127077b4a5627b98ede59e0a1823a1c35706e8d60fd1dcd86bdfcc43
 EBUILD netty-4.1.35.ebuild 5853 BLAKE2B a6f9664df891175234eb940606a8232a32ac7dbec4e6a2522bfabd0cc30cdfe7126e7c000f05460ba62791e9402c6bf2791b28180ce6844017fc9efa525db048 SHA512 2e5ddf7410b4f26b7559fd192dcc3242ccc4f84470a09abbc8a387a4c7a56fa2c62abf07619a83b82b8f10937d7589cde4e508ba61b18df9f9d1ca8dac0d74a3
 MISC metadata.xml 507 BLAKE2B 821a563701bddd615a49743269e82ef5f906d5f30d957accbba10cda171b3a8943911733247e05efc9c28b40fd75396e78c2b28c3297a74b15ea8b716dc50ad1 SHA512 5c237af46f2d99e807ad5d442c83af2d1bbd85f3d3ed71e5dc3595c91d2e8104e5025216911e74901817cfd495eb6e96e22248bd1a05c90018c7d13b99d1d494
diff --git a/dev-java/netty/netty-4.1.35-r1.ebuild b/dev-java/netty/netty-4.1.35-r1.ebuild
index f9ee4e1daad5..fd236b9511b2 100644
--- a/dev-java/netty/netty-4.1.35-r1.ebuild
+++ b/dev-java/netty/netty-4.1.35-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # We do not build the full range of modules provided by netty but only what
 # was available before in netty-common, netty-buffer and netty-transport.
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index edfdfd223eff..035da95af426 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,4 +1,3 @@
 DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
 EBUILD reflections-0.9.12-r2.ebuild 3885 BLAKE2B 20409316f8cc31dee09a80882d4baa59bacd0b92356b5e434d56ece38bdccebab4cabe82749735d5f6e5bf9f1b037d733bf03664c7389dd5ef0d3fa4f272994a SHA512 c915f76e25958e775bc378976e88c5a10e09c507a5b188be2442f3aa73fa3c928e78d9f4fdce8b2ab4ad30b67a568c011be1a3b1378ebe2edd760097b33d8102
-EBUILD reflections-0.9.12-r3.ebuild 3888 BLAKE2B 93b01b5e15609df55da1513e444d15c62dd0c396a454544d9c89298a685ac4ab2bcf71d05d1971213aeea21978d11d648681b6ff703150be64a8ad2be5133ebd SHA512 99491f84d078ab37579ea2dad793d2e2b791cad0bab7e942fa9ab68cb6252bffa5e46e59bbb5e98d02dc488520f3154ff7544cb85cb9adfbb81f385da8ade9fb
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.12-r3.ebuild b/dev-java/reflections/reflections-0.9.12-r3.ebuild
deleted file mode 100644
index bcec9edaeaee..000000000000
--- a/dev-java/reflections/reflections-0.9.12-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.reflections:reflections:0.9.12"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Reflections - a Java runtime metadata analysis"
-HOMEPAGE="https://github.com/ronmamo/reflections"
-SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="WTFPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
-# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
-# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
-
-CP_DEPEND="
-	dev-java/dom4j:1
-	dev-java/gson:2.9
-	dev-java/javassist:3
-	dev-java/slf4j-api:0
-	dev-java/slf4j-simple:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	dev-java/tomcat-servlet-api:2.5
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_CLASSPATH_EXTRA="tomcat-servlet-api-2.5"
-JAVA_SRC_DIR=( "src/main/java" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR=( "src/test/java" )
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
-JAVA_TEST_EXCLUDES=(
-	# Upstream does not run this test
-	"org.reflections.TestModel"
-	# 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
-	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
-	#         at org.reflections.Store.get(Store.java:39)
-	#         at org.reflections.Store.get(Store.java:61)
-	#         at org.reflections.Store.get(Store.java:46)
-	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
-	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
-	org.reflections.ReflectionsCollectTest
-	# 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
-	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
-	#         at org.reflections.Store.get(Store.java:39)
-	#         at org.reflections.Store.get(Store.java:61)
-	#         at org.reflections.Store.get(Store.java:46)
-	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
-	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
-	org.reflections.ReflectionsParallelTest
-	# 3) testMethodParameterNames(org.reflections.ReflectionsTest)
-	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
-	#         at org.reflections.Store.get(Store.java:39)
-	#         at org.reflections.Store.get(Store.java:61)
-	#         at org.reflections.Store.get(Store.java:46)
-	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
-	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
-	org.reflections.ReflectionsTest
-	#
-	# https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
-	# scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
-	# check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
-)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/saslprep/Manifest b/dev-java/saslprep/Manifest
index 5fef53fd39e4..113ab1a26fb6 100644
--- a/dev-java/saslprep/Manifest
+++ b/dev-java/saslprep/Manifest
@@ -1,3 +1,3 @@
 DIST saslprep-1.1-sources.jar 3735 BLAKE2B 4a2058856f0fa01a6f8ef05ca930d875825653f34c3d2b0bb81d658cb363fc5d4268a212d14e23ce60c666a1482de78e13483605c39783c81a971b148055464c SHA512 63badd75f5444af0077629dcf3f95a7c39d3e12f159a50748f54c36d2aa2cef90887c099d0c89007796174d48da0d25cc93db8ccf07660a8803e3edbbb92da05
-EBUILD saslprep-1.1.ebuild 623 BLAKE2B bb808530f5494f0d9d7cf854d68b5133b180c4d08985ecccbd866c3addc14fd4a01e61f4bb501de1874012d674c5a7c828882b5b3bd9464441dce341bcd80250 SHA512 d81f6848a5d51ece3e498bc68d50755a3008d583053ae8e1a735575bb063ec9a6304cb68dd663bdfce3475677405d5187ad80fda85be0c8570ce6b67d748263a
+EBUILD saslprep-1.1.ebuild 622 BLAKE2B ba8c767553ba79db58e558b39646638f5fd399d5f63cd99a80985c4c3929962ffb0e3a0424635fae33ffaeb92cd22b52d6b266ce0c88b97d3626d5202ada4e72 SHA512 3a61f89e2545030266ac4e06e9c08330eccc90f4625c754345611bd7e5224122d2fe5ab9474f4a6eadfa15e887639ffd1994913dcfff9e1ffa6d28e0d62134a0
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/saslprep/saslprep-1.1.ebuild b/dev-java/saslprep/saslprep-1.1.ebuild
index 61aea2d71fe6..999c14713ac1 100644
--- a/dev-java/saslprep/saslprep-1.1.ebuild
+++ b/dev-java/saslprep/saslprep-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/sas
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*
 	dev-java/stringprep:0"
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index bb98f1486fa4..d58be9f5d823 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1,3 +1,3 @@
 DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
-EBUILD scram-2.1.ebuild 2580 BLAKE2B 3cabd4ea28e07517ede2b5e640b8bbca1ab9d52216ca401958c40c640c05e1ee16a38c5e99cdce5135a8197535bc861b5acddf1895c1ad8a7f5de3f2e5b2a7d2 SHA512 8a7350dcf9c626b494dd37de62edfe71b24bcb38476ec4909f2f4de3eb8d7869fddd4e779940f1449628b1de443c69424cb55b33b5b7680169c25f86e4a6ee69
+EBUILD scram-2.1.ebuild 2579 BLAKE2B 6bd1b21231ccd36899d20a13ee6cf8cb42aa05300bf8478fa804c99944601378682a62b35134b85255c3d883294da53c3efeadf879f5b4f7ebacc213c4eeb454 SHA512 8e94efbd7f8596b3ea537300835e58c1ba6bd0df2633a50689d310a48da2aa13fc70e954d8ebdf7b90988fb8621874b10995e2e40e8ad9985dc2aa587c79cb03
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index 0595dcc0736d..c944a40da08f 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: common/pom.xml
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 5852eead8646..e897acf810ac 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,4 +1,5 @@
 AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b73b12ba406c24e63eb7408d9eadcc6f11d532dc635f5d6a3aa73bd09a6975941bb56b69a389c2c1b3edd37dbedcffd83a8bc2 SHA512 5f395fa1f79a9801de11a5e81244799511c88e689bf480e6099357dfbd6666ee8f19bb204adac47c1f6014e92f65476e5f0031b73268f8279cf6253cf6a387b1
 DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
+EBUILD snakeyaml-1.30-r1.ebuild 3105 BLAKE2B 8ae609514769ab73f7fc18166eac00916e04806273b9fb94f7e72f15137c60511953ef4b56cd6ce79a55020355820346ce28b8781547e0fb0121628ebd00d312 SHA512 5b57b2948c1aa449bf9e360def0fe2ff351511bd6282d7f866a947e57995728b18692c3a32f90f16d92a32e16760e28e80d1b74cdc55f324db6cd742698c939f
 EBUILD snakeyaml-1.30.ebuild 3143 BLAKE2B 3168587833152ded025e595d11391ada4fd9ffbca65429b3d59c23034103489190e02a56888372143ac32788c63ce39664c626f2855fd0603c0bdc6d5fce91bb SHA512 89a163deec9c2541d8358400f25d9b6793c2f2f150f4fb5cd7fd0aa90bba57fdb3fb4e359c552ba5c10ffb1d7e59719ff5a99496438b9e4b81dc1410734ff796
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild
new file mode 100644
index 000000000000..b61ad5b51877
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.30.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.30.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.yaml:snakeyaml:1.30"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="YAML 1.1 parser and emitter for Java"
+HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.10:0
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.velocity:velocity:1.6.2 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/velocity:0
+		dev-java/joda-time:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# https://bitbucket.org/snakeyaml/snakeyaml/pull-requests/7
+PATCHES=( "${FILESDIR}/snakeyaml-1.30-fix-test-check.patch" )
+DOCS=( README.md )
+
+S="${WORKDIR}/snakeyaml-snakeyaml-49227c24d741/"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_AUTOMATIC_MODULE_NAME="org.yaml.snakeyaml"
+
+JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
+
+src_test() {
+	export EnvironmentKey1="EnvironmentValue1"
+	export EnvironmentEmpty=""
+
+	# There were 2 failures:
+	# 1) yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.yamlClassInYAMLCL(ContextClassLoaderTest.java:127)
+	# 2) domainInDifferentConstructor(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135)
+
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.java" \
+			! -name "StressTest.java" \
+			! -name "ParallelTest.java" \
+			! -name "AbstractTest.java" \
+			! -name "PyImportTest.java" \
+			! -name "ContextClassLoaderTest.java" \
+			)
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/stringprep/Manifest b/dev-java/stringprep/Manifest
index 053dade65ed7..c0321a7082e9 100644
--- a/dev-java/stringprep/Manifest
+++ b/dev-java/stringprep/Manifest
@@ -1,3 +1,3 @@
 DIST stringprep-1.1-sources.jar 23229 BLAKE2B f347262c7b3a7632c94111226333e964b51a3bb8af357b79a62e1f457c5fccd845cb2d232f8d3cca4fc149c2341b962724397eff53224ade10f492a17298a00c SHA512 88cec43ad19a7a2a6194a62999fecb35e17ff04127d72fb0990f4003e41af1d3a5aeb8b2cc3c0c87165cdcb005963faf244f05d78c6f00aac0ab1835d336e565
-EBUILD stringprep-1.1.ebuild 571 BLAKE2B c8730509a201aaeb7eb14388d9fd8a44620a6bd1f55e0596708c8023a5ea0b31e57ac7e6a6aaca8858aa769fa62cd67d0662c30fa3386390eb43e7c0bd63930e SHA512 685f5c2b33719aa8274b128f7a405835b1b78b9702de163b45345ee45c713d49201cbeff7948a257e4af678e61b8931e0e11abdc2ae1be49b9981af5163ce8b8
+EBUILD stringprep-1.1.ebuild 570 BLAKE2B 643ae4963f27848dc0d0bc407c2768921fc5078893cd60157cfec00f173c1258dba121f51d074e03d7a7afd7bb2484d387ed043249f00eed8ddb4b46865ee0ef SHA512 f501eceec3237e2d18851549e8d14f0c67d2e1f603d696c3c4fe8f8ab206447fee314daef3723de43501d60ce43a4f7df1280ee3519c2f235d5b4733396765ef
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/stringprep/stringprep-1.1.ebuild b/dev-java/stringprep/stringprep-1.1.ebuild
index 5901d008a059..4265e6c33f7a 100644
--- a/dev-java/stringprep/stringprep-1.1.ebuild
+++ b/dev-java/stringprep/stringprep-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/${PV}/s
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"