gentoo auto-resync : 24:07:2022 - 20:54:05

19 files changed, 311 insertions, 55 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f108d8e84093..cb5ba8face03 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 36555c76964f..dd2273829040 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,3 +1,4 @@
 DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
+EBUILD commons-codec-1.15-r1.ebuild 1414 BLAKE2B 906332a4c55b087f41c1d29eb6b62ec68b7a7822a07504a0e8ec25675fb461f76f68c12c54abf48a3d029409c510aae592585e35f56dab6591385dc966283d05 SHA512 a729d97c766f02083ff0cc7bd56d519896e73b581d001b201189abd3e24635c200ce0e8d759abbcb0e06a56eaf97043ccedc38651edd1da37c8face24a2f4775
 EBUILD commons-codec-1.15.ebuild 1369 BLAKE2B df61c7883f36aa5caef0f3c7cb2be1bcf5acb10936f13e412be92f1b90515b5bc7dcfb4660857947af3ea5b4ada6fcb7e4b162920aef6e08fbabc3fea93fdebe SHA512 18b143f79137db9d1279d7c637d3f37ab1189c7af3b640f8c9afa34538b2cd4fa5b11f48622776f896ad1361f454735b72d05e23264c7c9027e8bc3d52cc858d
 MISC metadata.xml 1361 BLAKE2B b73337d1547879b37b5c97ab5365258989ac49f45ec1e0c10b835a849ad804e0da7f737f0e67e660a34f3ff1c2a66876f1878a98680b0e86740e84b9eaa16e9f SHA512 50d46b0c3607e8181f516ffc198c5cb2640b7c1182c7242f3e10b8671d85b12fa9708847148b937fe824b990b89f25bee4a95722b86742edd6554c39d4768262
diff --git a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
new file mode 100644
index 000000000000..e611ee200c7c
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom commons-codec-1.15-src/pom.xml --download-uri https://apache.osuosl.org/commons/codec/source/commons-codec-1.15-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-codec-1.15.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-codec:commons-codec:1.15"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementations of common encoders and decoders in Java"
+HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
+SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Compile dependencies
+# POM: ${P}-src/pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? org.apache.commons:commons-lang3:3.8 -> >=dev-java/commons-lang-3.11:3.6
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/commons-lang-3.11:3.6
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 6d1245fdad74..87f0aa1eb855 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,5 +2,6 @@ AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf05
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
 DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
 EBUILD commons-collections-3.2.2.ebuild 1389 BLAKE2B 1190300af0c8b7dfca7edb662a7c9314111a95ab56de0eaaa93fd0f26e21475181befd7fc41dc3b064c41e85c17ab95562afa6170ab53c4e288903caaaedf2f0 SHA512 a1881fd133e1efba964a2fd3d60575fbe88da634b0e41d8ba3244e306ad63c54db5be60e284cfb0ff34a72067bbe73a11ed2aaab60468896afc9c10172559196
+EBUILD commons-collections-4.4-r1.ebuild 2128 BLAKE2B bf81a99e43a39365f1911cd22eb1c210e8ff454adc01b94c3a46bfc4dc1c02087a101125419b23ced87a90c73649305e7a390df8d05865e587ab60a173533e69 SHA512 edf0730197db410f01bff4cfee54ebd471086473f5b9a3d1b5dea03e89a6373c8d69dbb77f469fbd063558f4e6d4793b0566437a25538623b6e527174f828e2d
 EBUILD commons-collections-4.4.ebuild 2063 BLAKE2B 76df1c1b3ed4906d090b37e85e121b17c940874e6202db0a5af683349cc1113e8de23429a1fd79924dbdcef6e2e1e832329ec16340a6a91d255d34f8fc4db8a6 SHA512 1eda617730964949d02621787efa47a87652f7d757b4678b00e05cca4cc4ba10266eeb62209db63ce5ec745502110dd6e9ec1e1a801f49ccfcf6065b68d8a248
 MISC metadata.xml 388 BLAKE2B 11018df0e1c7417ebbc68b44642701ad88c8add20c233cceafb84c41b56cd7e3d2f0004406ba6286babd78493dda13171c1c3b0a1a7b563289d2c4c58921bda6 SHA512 28a72920d0c97f0caae41ba74a55602e25c953d2c510e0e4d72a8c7482abe7855b587fa85efbc51c9262472b90ae35a88732d33744a101d288ec8afa8fff4ae2
diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
new file mode 100644
index 000000000000..c55d0bb19796
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -0,0 +1,68 @@
+# 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 mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/commons-lang:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
+
+src_test() {
+	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+	pushd src/test/java || die
+		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
+		TESTS="${TESTS//.java}"
+		TESTS="${TESTS//\//.}"
+	popd
+
+	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index ac793302e58e..913aaba6063b 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,4 @@
 DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3
+EBUILD commons-io-2.11.0-r1.ebuild 1879 BLAKE2B c348641cc0dbd80cf3a080fabe9a1169831ed82cc6a8313db136051c40a1a281f3656ab4549851faa312943f781e4fa5f8bc0319d0691199b3a7bb34476e99c8 SHA512 5a131e0da771c8a7aa1ed6bc32a15e73a79ba5e7ecb4192acfa6dbb37f90a4fb2c0a0d80e9574086e3f74addefa68a76e19beeea812b76899c1891191a3df372
 EBUILD commons-io-2.11.0.ebuild 1829 BLAKE2B 9752da4af980cd2a649eb50802af49560f0b1cb2db6ba2716222bf53e1ce7650954accf2c68551034428eb939ada28e406a1320b01045772a158b4b6394b7f8e SHA512 6cf2465163855384be4bb0f542f86fc1efe0c99a13c1d476d871478307c073cc83be815018fa77aa4a0d63fa714b11dc1acc5b6b7e306cc269a582139d790d0a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
new file mode 100644
index 000000000000..73150451cd28
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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://mirror.dkm.cz/apache//commons/io/source/commons-io-2.11.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild commons-io-2.11.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-io:commons-io:2.11.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+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 -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.jimfs:jimfs:1.2 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.junit-pioneer:junit-pioneer:1.4.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.7.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-inline:3.11.2 -> !!!artifactId-not-found!!!
+# test? org.openjdk.jmh:jmh-core:1.32 -> !!!groupId-not-found!!!
+# test? org.openjdk.jmh:jmh-generator-annprocess:1.32 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/commons-lang-3.12.0:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# some test dependencies are missing
+RESTRICT="test"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-lang-3.6"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.io"
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 006eb3322112..90b1bf9dedad 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,3 +1,5 @@
+DIST commons-math3-3.6.1-sources.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
 DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
 EBUILD commons-math-3.6.1-r1.ebuild 741 BLAKE2B cddab31becc324b2e4fd262d6de490542cd5f482a1b29dd9a59d8b0139c1e7112545b59349ed9cee2519ddc56d80ee6feba6e65ef5dcb21bb9f1ea3305306f84 SHA512 97a2384bf11b39cea6aab1c041acf2236491d766c799f13342cd4c567b86d4a85cbc1ed500d3c7460bcaacf5565008fc9471af60babb85e3bdfe0f85e0082da7
+EBUILD commons-math-3.6.1-r2.ebuild 774 BLAKE2B 23b4d26fbd92105105b7b590c1fc1080e478b0b31f7b8e61267974e1a5f837f5bdec9fdccba3218f1adc801107ef07482dd7e78ac017fe8edd3f3da9e13476cd SHA512 e06e385c03281343f8e35786d40f3ea79e2f112830d919225588d8b7aeba05eb5b4fdf02eeb766c84c072d3ae766bbb9db7d84e52252ecf9780a33bedf8ab057
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
new file mode 100644
index 000000000000..0c33559066fe
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="org.apache.commons:commons-math3:3.6.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="https://commons.apache.org/math/"
+SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
index 924143fb8a25..947eb2222d83 100644
--- a/dev-java/fastinfoset/Manifest
+++ b/dev-java/fastinfoset/Manifest
@@ -1,3 +1,3 @@
 DIST fastinfoset-2.1.0.tar.gz 304643 BLAKE2B 07d571d46dd31bbd1fb9a4aac457b7a2b3e9278a41a9b072790a2da56adccbba92cdfd7dde95d976d92c7fa38476448c3dd6e77366338fdce3e63f334e5823d4 SHA512 807926fe90f97a72e5d6f8abcbad8639b424d7938ab2afc7dc8107070db216167aada859acd041ba17566a33e277330d9ee51bdc10d16aa19a6ea07d4ae858aa
-EBUILD fastinfoset-2.1.0.ebuild 1299 BLAKE2B 486d884ced50005bbf36dcd60fdb82c4dba9180668c41aefbe3d3416b4a2c5af75bce8bd074def5c0e3dc5445dc82edc7c305a0ff360274e6736619ce5c88cf4 SHA512 b51fe6dc1d12db631e62f0a4a667e289efd5d2799b7b31af7aceb40a24a8984a1d25c4636dc24e1e2b7a85f347027fd13af32a7c182974854364b8d954a744b0
+EBUILD fastinfoset-2.1.0-r1.ebuild 1208 BLAKE2B 07031c4dce4caed0ec2abcac2648403a59c7ae6b830fcced02f6f5dd5a3e1ef5c5f12779754e82344f183b1484b8e0b19a512c40716de9ff24a4a596016c2424 SHA512 43c2d2c5f8d5e51f6a09d8e35870f3f9bfc9079fa1eb14c67f9b1a16beff4c1a677111a1f8b860cccf582019da01852d469f970c0f65e973b85b5bd6cc49b961
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
index 6cf8d07641ca..7f4e952e82bf 100644
--- a/dev-java/fastinfoset/fastinfoset-2.1.0.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 "
 
 RDEPEND="
@@ -39,8 +39,3 @@ 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"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest
index 5a41a7f809c1..add8ed089b35 100644
--- a/dev-java/jaxb-runtime/Manifest
+++ b/dev-java/jaxb-runtime/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743
-EBUILD jaxb-runtime-4.0.0.ebuild 3314 BLAKE2B fd7c5aa639ff12d7b2f19702e3d92113369ac74f3027caad750e71739611a64ee067cf811916b4bc1502655c98748945aa43e6fa028af356a239aa3070a82a31 SHA512 c8506d511c249761aa5cbdf079b19354e2ce5639726e49bfc5b825db37faae0b000d029fc5639159c4de765f119d6cc5834bdeb97dc9d29536786b0875f37cc9
+EBUILD jaxb-runtime-4.0.0-r1.ebuild 2989 BLAKE2B c11dcc38dfb8a2f584b34a10ffac8d8bb23c1499e3faa442d76f37aa997d6bd0bf87d05bc627dcb5a892bb1659bef93cc84b8b3d2e2ef4520cb380f8d0d9548f SHA512 601617a2d6801029c9fb36e64a8bb665eff04cd1dffb8fd7f812be07c13ac228e853ce0282ea3c3886c806a266bf683e800909672cd608051b65ce39add35a50
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
index 0f4c1c55c97d..586a6dc6e5e1 100644
--- a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild
+++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
@@ -20,34 +20,23 @@ LICENSE="EPL-1.0"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-# Common dependencies
-# POM: runtime/impl/pom.xml
-# com.sun.xml.fastinfoset:FastInfoset:2.1.0 -> !!!groupId-not-found!!!
-# org.glassfish.jaxb:jaxb-core:4.0.0 -> !!!groupId-not-found!!!
-# org.jvnet.staxex:stax-ex:2.1.0 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/fastinfoset:0
-	dev-java/jaxb-stax-ex:0
-"
-
 DEPEND="
-	dev-java/istack-commons-runtime:0
+	>=dev-java/fastinfoset-2.1.0-r1:0
 	dev-java/jaxb-api:4
+	>=dev-java/jaxb-stax-ex-2.1.0-r1:0
+	dev-java/istack-commons-runtime:0
 	>=virtual/jdk-11:*
-	${CP_DEPEND}
 "
 
 # reason: '<>' with anonymous inner classes is not supported in -source 8
 #   (use -source 9 or higher to enable '<>' with anonymous inner classes)
-RDEPEND="
-	>=virtual/jre-11:*
-	${CP_DEPEND}"
+RDEPEND=">=virtual/jre-11:*"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
 S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri"
 
+JAVA_CLASSPATH_EXTRA="fastinfoset,jaxb-stax-ex"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 
 src_compile() {
@@ -62,7 +51,7 @@ src_compile() {
 	JAVA_SRC_DIR="core/src/main/java"
 	JAVA_RESOURCE_DIRS="core/src/main/resources"
 	JAVA_JAR_FILENAME="core.jar"
-	JAVA_CLASSPATH_EXTRA="istack-commons-runtime,jaxb-api-4"
+	JAVA_CLASSPATH_EXTRA+=" istack-commons-runtime,jaxb-api-4"
 	java-pkg-simple_src_compile
 	JAVA_GENTOO_CLASSPATH_EXTRA+=":core.jar"
 	rm -r target || die
@@ -89,10 +78,6 @@ src_compile() {
 }
 
 src_test() {
-#	einfo "Testing txw-runtime"
-#	JAVA_TEST_SRC_DIR="txw/runtime/src/test/java"
-#	java-pkg-simple_src_test
-
 	einfo "Testing core"
 	JAVA_TEST_SRC_DIR="core/src/test/java"
 	JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
diff --git a/dev-java/jaxb-stax-ex/Manifest b/dev-java/jaxb-stax-ex/Manifest
index b01b9a8bdb2d..7542fd420c4b 100644
--- a/dev-java/jaxb-stax-ex/Manifest
+++ b/dev-java/jaxb-stax-ex/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-stax-ex-2.1.0.tar.gz 28683 BLAKE2B 774f7420f996eb52abc9db56753f0fc492164ed12f4ddffacad8f801ac759666e6dcae85cf24ce1231df4d49d5b5084278d2cac0c5c129302ec973c215408782 SHA512 f81dcb4870800c4799e716254b84e57a15ef36a9e6a8502da7ee2711aad67765595674fccc1c4d9d4e8865c642dfadd694f8849d4e98c4e9f2368cb940deb38d
-EBUILD jaxb-stax-ex-2.1.0.ebuild 1500 BLAKE2B 5af4074e598d332c85e9a6386e944f69938b605597a5fee41ba0733ddd48c539c09a6f879ab4a7356292bacb1be0379bfe05a72a5fb83f8510aeb35bb1645c32 SHA512 8fb0e65392faa12ea72b76dd3409a8550b0d757e851ddccb09e04b3435e51c3fbbbf73a3dba7f440a9db5e239db9aac1b1f5141388a9cad073691194ab4e786b
+EBUILD jaxb-stax-ex-2.1.0-r1.ebuild 1059 BLAKE2B 0f74fdf68fc817b822e6f6462832157beb235a70c6a45c3a94666c31e0a64fd14b076cc441666bf6140b1535505f6ee73941ac8cd7cdd1d75f66f0000988aebd SHA512 ba01a4ddfcad5697d95a759013e8f657a829db482b0ccf076cd56269e5a96119fc4c8d4d3166289ff87435288b3ce87e9983c46d7ba86e10bb64a6d64807ce15
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
index d3f278e69c31..e7cfb9f464e5 100644
--- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0.ebuild
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
@@ -20,39 +20,18 @@ LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-# Common dependencies
-# POM: pom.xml
-# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2
-
-CP_DEPEND="
-	dev-java/jakarta-activation-api:2
-"
-
-# Compile dependencies
-# POM: pom.xml
-# jakarta.xml.bind:jakarta.xml.bind-api:4.0.0 -> !!!suitable-mavenVersion-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
 DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
+	dev-java/jakarta-activation-api:2
 	dev-java/jaxb-api:4
+	>=virtual/jdk-11:*
 "
 
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}"
 
-JAVA_CLASSPATH_EXTRA="jaxb-api-4"
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2,jaxb-api-4"
 JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index ededfad48d7c..c6557f94e9f0 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,3 +1,5 @@
 DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
+DIST poi-src-5.2.2-20220312.tgz 117042913 BLAKE2B ef2ab433158ac51fc163e9bfa65268d246a686c7892234cdd2332bef526c69b59dd0959bdabc6a486a99e20dfcc144ff6aff775a6412136112bb6a36f10968d3 SHA512 858d6c1af8a29a22aa24bef0422b3c8329141ff026131b8354a97c87acc31ef06c91f1b9cabeb71738b3687ddc8283f19b2ac42865b7e98e91cb0d5aa6b89b40
 EBUILD poi-5.0.0.ebuild 1952 BLAKE2B 92ad38903362045d539e01fe2d62bc95325e87c1224cbf1a08a9c80e61aeb195f0f388b0ab47b6def950d2b095d02b98a369f52c010f34b1fdb398012ef4cafa SHA512 c5fff618b8dcea6970b1ccc3adf52631ee731ec78b762f17896efe0f2bee907b6ad9d0fd197183a3cb9e175290915d388d014d326555bf3d2aeb8b1a4ecc1f6c
+EBUILD poi-5.2.2.ebuild 1770 BLAKE2B 366c7228cf6af438faf508cf4e6b55da491e3595b991a6f13016caa4b5e259e69064dd26394b9072782e3a55125f6e5bedea535f007038abc4daf3bafa3b8249 SHA512 ee2965f45d229c6dbae4dc0a0b81617f2b86db4809605ee2311230ada5bcb243821052a6edf4fadc8c545399478ef8ac74c500d34abe22a5b3aa1f30d38974b1
 MISC metadata.xml 429 BLAKE2B 5de897522625a2c4ff05fcbd8f1ffc1e58bf734febe26f28a23e9f1a3a93d3acb1d099d9cc50d329c14bf9c586e15b74bfe061ccab493ce1627161ebce46a845 SHA512 a8b3da8273c10239b9bde465b67dd818d74910bb9303462b68df5ee9487aaeefbfec324bd0492601c75adb4e9fa163bf99ca7ececf2684f4778a61041a98e75c
diff --git a/dev-java/poi/poi-5.2.2.ebuild b/dev-java/poi/poi-5.2.2.ebuild
new file mode 100644
index 000000000000..054dcda2ddc5
--- /dev/null
+++ b/dev-java/poi/poi-5.2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom poi-5.2.2/sonar/main/pom.xml --download-uri https://archive.apache.org/dist/poi/release/src/poi-src-5.2.2-20210120.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild poi-5.0.0.ebuild
+
+EAPI=8
+
+# tests depend on junit-jupiter which is not packaged
+# https://github.com/apache/poi/blob/REL_5_2_2/poi/build.gradle#L51-L56
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.poi:poi-main:5.2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Maven build of Apache POI for Sonar checks"
+HOMEPAGE="https://poi.apache.org/"
+RELEASE_DATE="20220312"
+SRC_URI="mirror://apache/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-java/commons-codec-1.15-r1:0
+	>=dev-java/commons-collections-4.4-r1:4
+	>=dev-java/commons-io-2.11.0-r1:1
+	>=dev-java/commons-math-3.6.1-r2:3
+	dev-java/log4j-api:2
+	dev-java/sparsebitset:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}"
+
+JAVA_CLASSPATH_EXTRA="
+	commons-codec
+	commons-collections-4
+	commons-io-1
+	commons-math-3
+	log4j-api-2
+	sparsebitset
+	"
+JAVA_SRC_DIR=( poi/src/main/java{,9} )
+JAVA_RESOURCE_DIRS="poi/src/main/resources"
+
+src_prepare() {
+	default
+	sed \
+		-e "s:@VERSION@:${PV}:g" \
+		-e "s:@DSTAMP@:${RELEASE_DATE}:g" \
+		poi/src/main/version/Version.java.template \
+		> poi/src/main/java/org/apache/poi/Version.java || die
+	# Neither log4j-api nor SparseBitSet provide Automatic-Module
+	sed \
+		-e '/SparseBitSet/d' \
+		-e '/org.apache.logging.log4j/d' \
+		-i poi/src/main/java9/module-info.java || die
+}
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
index 04f382b3c227..21bd40eeda0d 100644
--- a/dev-java/typesafe-config/Manifest
+++ b/dev-java/typesafe-config/Manifest
@@ -1,3 +1,5 @@
 DIST typesafe-config-1.3.0.tar.gz 257311 BLAKE2B 6df016ef84f8e3f717ac22ea3a8a66ad54ab378645e853fbb5fbb3316dde56e4cf6ba7a256f38d8912514321060290a92c412ad9753c0244b35c20bb0a9e4950 SHA512 e8c0e3100b9e7c50ddd19285a3e33cc708711d0007719bb191012d88ddbd0286529172fce54a369c0dd86ced1c61807f40d5334a69b2c8bc6865a8b65740798e
+DIST typesafe-config-1.4.2.tar.gz 278098 BLAKE2B 65e3ffb4e9a4a7c33344c7f26ac28f6321c83621865db7812c09e7908e10f110bcfab4eca66577d6495f94da6a11b8877920e87afa6976c25852c5ec08aa1148 SHA512 85bc28987a6998a5ce6e0bb0996d853b534fc870e44abaeb3df31e53a2da39a350aecbd8f8849f4d4340a7e5da1c44882eb8c8ba58233c9af2a0e575f2c2c6db
 EBUILD typesafe-config-1.3.0-r3.ebuild 512 BLAKE2B 13f33e7248c0d8d7f15f1bca2e1b63c47bce646602508ac90cd06302fbbbea7c6f39b80c9e05c62fdd89c2ad8563535e36be573bfdfe58b0beacf37bc5abaa5f SHA512 6634d02248b9f9c802d284a6030fab70e1dd9a8e0100ea60e7e840e73e3e74745b7cff0eafbfa10fb02fabb07be6fe002d40364c1c0b951f2106206dbe661b10
+EBUILD typesafe-config-1.4.2.ebuild 902 BLAKE2B 032387a7d2b6029b6d272f431e95a77b7a8f1605913bd7758d310b71a8e327b9fba4fa2877ed8d0ba9a61c7e0cfc8f0da6276a413e8076c2f6f13e5fc3c2f446 SHA512 3629a153e8b82d63a60ddea58e68812b7fd58acd92d46a29aed64b442b7550df62a16c99c6c645bebb92ab6e5b6bf11dc3dd5ac043a6bb81c1399ddda8b05b7c
 MISC metadata.xml 330 BLAKE2B 15d72bc4f4449579e0bc922932f2f6e9249683176213f8dc7e3b20c65d6eaa67f09bedcb87b58c66cce197e0e1f4e65bcb465f2946005ecdf9efe5a33923d3bc SHA512 601bef4eb1b817811252290e3a62e6ec51a2dc0d82c5b6fcdbbe7eb21c25b690168bdaa9952e4d3faa8dd1e97f18daa429cd9514e6d8995009621c83e3f311ed
diff --git a/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild b/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
new file mode 100644
index 000000000000..e9aedc5756a7
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.typesafe:config:1.4.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library of arguably useful Java utilities"
+HOMEPAGE="https://lightbend.github.io/config/"
+SRC_URI="https://github.com/lightbend/config/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+DOCS=( {CONTRIBUTING,HOCON,NEWS,README}.md )
+
+S="${WORKDIR}/config-${PV}"
+
+JAVA_SRC_DIR="config/src/main/java"
+# https://github.com/lightbend/config/blob/v1.4.2/build.sbt#L104
+JAVA_AUTOMATIC_MODULE_NAME="typesafe.config"
+
+# Need to anylyze what to do with this stuff
+JAVA_TEST_SRC_DIR="config/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="config/src/test/resources"