4 files changed, 119 insertions, 0 deletions
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 197b8087d98e..96f529c7f707 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,3 +1,4 @@
 DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
 DIST mockito-4.8.0.tar.gz 1044264 BLAKE2B cbd8fa0db3b652ad882c6bb8c5f86116cf21772869814ddabe88532ff2522e399e8d7e9d68935b10844c0c496755834dee66c88dc7b2e0231757f7c79233c1fb SHA512 1f1ea9aac907d8ba42874eb6a6870cd5cb46b80a4a9f841c7eca8ff8f651e13baa92a4c3512d95d6596dd7da60e627a606c74e4b1dc56d11b06a14f44e3d53f3
+DIST mockito-4.8.1.tar.gz 1045454 BLAKE2B 82efc18afa8efae2495fdd5b0db58ddde8ea5cae9b7dfb554075924e343f5c0290a7f5d63b18c217b33a11c31a13ac40fcd28a752b0deae737c4bd75ea13c044 SHA512 dd2adc2211637daa86f5174e333744c5a1ff29dcccf9866a33933e2ba945d99781d5860c6059e6fa06a649d9a45417ab13066f8c8e896cb753b6e0869f0e2b03
 DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
diff --git a/dev-java/mockito/mockito-4.8.1.ebuild b/dev-java/mockito/mockito-4.8.1.ebuild
new file mode 100644
index 000000000000..24aa0f28cc67
--- /dev/null
+++ b/dev-java/mockito/mockito-4.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests not enabled, wants junit-jupiter.
+# "${S}/settings.gradle.kts"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.mockito:mockito-core:4.8.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mockito mock objects library core API and implementation"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/asm:9
+	>=dev-java/byte-buddy-1.12.13:0
+	dev-java/objenesis:0
+"
+
+DEPEND="
+	dev-java/junit:4
+	>=dev-java/opentest4j-1.2.0-r1:0
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="
+	junit-4
+	opentest4j
+"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
+
+src_prepare() {
+	default
+	# dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
+	sed \
+		-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
+		-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
+		-i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
+}
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 446c7ed3e502..8554a4c8a5fc 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1 +1,2 @@
 DIST poi-src-5.2.2-20220312.tgz 117042913 BLAKE2B ef2ab433158ac51fc163e9bfa65268d246a686c7892234cdd2332bef526c69b59dd0959bdabc6a486a99e20dfcc144ff6aff775a6412136112bb6a36f10968d3 SHA512 858d6c1af8a29a22aa24bef0422b3c8329141ff026131b8354a97c87acc31ef06c91f1b9cabeb71738b3687ddc8283f19b2ac42865b7e98e91cb0d5aa6b89b40
+DIST poi-src-5.2.3-20220909.tgz 117839114 BLAKE2B 8b62f212dbbb6c7c20900dad97eaee20d416129d1529f42d3f3d15c42dd737af389f3d46c0891f733ba6ce143fa30c73aa921a2f007e68ecbfcd2a61da27baec SHA512 15d1d9387a3003fa30dc77cb42721daefb07a0f8ef1a69873107fd2266d66ae5c0138f47f2867d49154bbde4f28939ac1aa1b49e367230408e67c05099addc1c
diff --git a/dev-java/poi/poi-5.2.3.ebuild b/dev-java/poi/poi-5.2.3.ebuild
new file mode 100644
index 000000000000..4ac75b353fdd
--- /dev/null
+++ b/dev-java/poi/poi-5.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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="20220909"
+SRC_URI="mirror://apache/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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}-${PV}"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.poi.poi"
+JAVA_CLASSPATH_EXTRA="
+	commons-codec
+	commons-collections-4
+	commons-io-1
+	commons-math-3
+	log4j-api-2
+	sparsebitset
+	"
+JAVA_RESOURCE_DIRS="poi/src/main/resources"
+JAVA_SRC_DIR=( poi/src/main/java{,9} )
+
+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
+}