7 files changed, 97 insertions, 2 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 64912b389da5..8c05322b05ae 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index c5365fa434c3..75593c41c492 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,3 +1,6 @@
 DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
+DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
+DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD guava-testlib-31.1.ebuild 1646 BLAKE2B 47da5c59670dc4ddf27b2f02a2befe071ba5348b1ff1582e500bab4fe47b1e5e1fbaac53ffc80246d505cf2101547b8ae1547f1862c881fc0dfefd7cf075f73a SHA512 1b9ab91d462df2c38d3ad10304906ab9d870d3308632cafefba10d24f78065b635d1759bf34a727064a5dd61bcb06206ee3172dad82b44229606657871639bd7
+EBUILD guava-testlib-32.1.2.ebuild 1303 BLAKE2B 06343cece40e6853d1059e5153879006cf781d33f2662927d4679d359521a1162a994ca7454ad8326e3714df4e26d6610ea263be559e7e3531b4fce0d60d23d1 SHA512 734d6b338d76233b31c6e20df568dfd2cdcd42d0d56e89849a90a8008825e45a0010064792ebfc6135fa5298a49315569ecd682c13c8d1777a29950f8a62533f
 MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
diff --git a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
new file mode 100644
index 000000000000..80d71fe50c23
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests because "error: package com.google.common.truth does not exist"
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/guava-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/checker-framework-qual:0
+	dev-java/error-prone-annotations:0
+	~dev-java/guava-${PV}:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="${PN}/src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/test"
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 03ad7e0e1a2f..072148a1e783 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,5 @@
 DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
+DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
 EBUILD guava-31.1.ebuild 1661 BLAKE2B 827e4095f2dac42147b1941e26cbd75a53cad90a3fc2b7ab24e67f9cb5aef96a47363860348e36eb05835ace4342633370da0c78f6f5f3ba64fa140931a86811 SHA512 f631348ea551d6e4f69e366caa59d7cd67a15d4c165b0dfbfabd85bdb5a65b11bd372fb4516cff289b8ae52690d66c7619a7a670a70353afeb09a6dd351e73ef
+EBUILD guava-32.1.2.ebuild 825 BLAKE2B 6a4aed091fa674276eec0bc71113e2037dacd2c487fac95ab1b55415d37deb59430e110b30a44853eb811bd0e8e27ce66fe5f63d71cbb49d33abfdccf3e181dc SHA512 7f499854d905d8fe32ce741d60cacae32d4d8f22c0b273e1ffbb8bcadbf01dcacf75b595f9a50bfb51e278bf8ef91632b8f28ac38db3539933e5c1ade940c2ab
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-32.1.2.ebuild b/dev-java/guava/guava-32.1.2.ebuild
new file mode 100644
index 000000000000..e829a5a060be
--- /dev/null
+++ b/dev-java/guava/guava-32.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/checker-framework-qual:0
+	dev-java/error-prone-annotations:0
+	dev-java/failureaccess:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 3bd4b32f393c..388855965b26 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,3 @@
 DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a
-EBUILD jakartaee-migration-1.0.7.ebuild 2699 BLAKE2B 2a1119af44ba250e8b054d6842c8d1d4ca9844372c4cd1d26432c57884ecfa55038d226bfda4f2b2c6809722becfb3427a23797cb3a0f5a3648f115898c8b538 SHA512 65151eab343e4677aa5b11282bd85a6a24d5c291e1db261ca883d9cf2831998755bd37d8bf667e06c38bdd1ca08b5087eccaf85095d348ec9a462bb7b1ff3bc7
+EBUILD jakartaee-migration-1.0.7-r1.ebuild 2906 BLAKE2B 54e23eddd457ccfc5e693064eeadfe94a369144f180cda8e9bd372c535de1ba871dfdd14df2bc3f6fd356a727de5718b2cc0d96f863978e4cdfdd51b22ede8b1 SHA512 1b8797cd4d9ca032f1c9d69bf89a8c3b281f79f09bb6a2de54b12dd823e17ffb5ba8fe1af66c3659309da89b49dae52f04c5853dd1361f4ad17ae3ef85064ead
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
index d9f90c755e38..4308d151f1bf 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
@@ -35,8 +35,13 @@ CDEPEND="
 # POM: pom.xml
 # test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
 
+# we need jdk-11 just for some tests as those need stuff from newer jdk,
+# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
+# with tests disabled
+# see bug https://bugs.gentoo.org/910499
+
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CDEPEND}
 "