gentoo auto-resync : 08:12:2023 - 11:11:23

23 files changed, 339 insertions, 4 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1b37e202e4b0..4a0961481a3a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
new file mode 100644
index 000000000000..34bee0c67589
--- /dev/null
+++ b/dev-java/caffeine/Manifest
@@ -0,0 +1,3 @@
+DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
+EBUILD caffeine-2.6.2.ebuild 981 BLAKE2B b7c725d349d32d0f338cff4993583ab071d8e2c80235a412b19d0cb1937484afbc76aa24de023eefcdec51b160176a01aed7467d81bd71d7b6d62c5e8bb3cf8e SHA512 ccf0c2804081e007289d35e9eb676bd93a8a2dc753745fcb067cc9fbb6287a4e8f053923325e88d33403b2f6df3770cb706c9c98c2358b84e4377e305c816913
+MISC metadata.xml 300 BLAKE2B fc46ab992a4cbfe6a697b414e72f7bfa69992f5fdfdfa99c2b94b69643492f8144351125ca0edf4cfb4e8d9e67c6aa026d9e7e4d000f46250ff57716cce65ff0 SHA512 fc4dc1847395e619c603488ca3b18b94fcc96e21461854009d46a0e73ff694066e85478eae5c20f8493eda9203ab159ab3a625ac7df49190f7f2e162dd3418fb
diff --git a/dev-java/caffeine/caffeine-2.6.2.ebuild b/dev-java/caffeine/caffeine-2.6.2.ebuild
new file mode 100644
index 000000000000..019d6c37a222
--- /dev/null
+++ b/dev-java/caffeine/caffeine-2.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A high performance caching library"
+HOMEPAGE="https://github.com/ben-manes/caffeine"
+SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
+# Compiling from Github would require to be packaged at least
+# package com.squareup.javapoet
+# package MethodSpec
+# package TypeSpec
+# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# S="${WORKDIR}/${P}/caffeine"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/jsr305:0"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine"
diff --git a/dev-java/caffeine/metadata.xml b/dev-java/caffeine/metadata.xml
new file mode 100644
index 000000000000..8168da8f9820
--- /dev/null
+++ b/dev-java/caffeine/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ben-manes/caffeine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 05f213142d1b..c936d8b97020 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,3 +1,5 @@
 DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238
+DIST checker-framework-3.41.0.tar.gz 8271094 BLAKE2B 804e0b03872f4b6d9311ddba83bc2ae1e6f167fd62330d2461ee54338e592c84b4d94200f6e0d1de6ed0258343ab0b081f3e8108efce62f396c7c753cadae471 SHA512 4d0f82269a521c498b2e54bfaed1513c708e538fc42b5bb22ae176a368c7f409548820f8fa56009997e341f1b716c184bdbadf4d3b5b9e2f3d2ee4148eb6c433
 EBUILD checker-framework-qual-3.14.0.ebuild 731 BLAKE2B 57d49bd7011c294925573f2e71a225ae0b6ac054af1cb0b4da0fb2f363063df33d5372e6dde14b946740c18d95c62210f511a02591931c4ac4a9544ead1c8f97 SHA512 6f6a6b2965218142daa81ccc3435d9f53a7dfbd1cd9d1eab8afe26f0601075f611abc831ac6dc4e3d6ab48f7cd927d76fd8683f80e8f533d6c9bb236e3305716
-MISC metadata.xml 559 BLAKE2B cfdff3f58c4318542e3dd6ac9c98c826607441b11506ab0c2b0357701908c02a5b9e4496550fd81ffeed8b853598885230bf36118b4d36a49f191dfd83bece6d SHA512 fc19ef762da9b61820497c0febb3c5213c661aed64630f8235d06c895588743fa22dbe27930afe2790ee88c32e4744b4f4c44993ca0e251f98add7f5e66ee042
+EBUILD checker-framework-qual-3.41.0.ebuild 682 BLAKE2B 3e02d971e2c1bd39919d8eaa18fe8ecd4db3baa1631daa4eea0348d17902d0185b3e9859b7f82486e4ef31c2b18958a99a0fcc4dce8f40ceb4d1b0fbab5b7b68 SHA512 b90588e05e0e4f0e8a2287a7508a213233839ceea0719fd6a333aa4e663fc328d9251bfaf31183b401a5252a6a0749eb7f3ceba15eee57a2e59586c05f7457e3
+MISC metadata.xml 651 BLAKE2B 2c53d072eaaaa7d09e5d185281efc9c897d1c8008dcbeb791c6b737614aa13f1091bda90b7fea33ff083c32dbd60dec180414af016af94850dee8b2bda8e865a SHA512 3428b96b3eac8b7416aabe2201af09c9bc4c444240ae682750573187a5ba137644aed7cfbcacb3a1162780a9eeb8544b0d6500cefc8f6e62f700271fe185a4d1
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.41.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.41.0.ebuild
new file mode 100644
index 000000000000..6504503b76cd
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.41.0.ebuild
@@ -0,0 +1,23 @@
+# 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="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
+S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java/org/checkerframework/"
diff --git a/dev-java/checker-framework-qual/metadata.xml b/dev-java/checker-framework-qual/metadata.xml
index ca606ae4ec36..29b8e33bf4e4 100644
--- a/dev-java/checker-framework-qual/metadata.xml
+++ b/dev-java/checker-framework-qual/metadata.xml
@@ -5,6 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">typetools/checker-framework</remote-id>
+	</upstream>
 	<longdescription>
 The Checker Framework enhances Java's type system to make it
 more powerful and useful. This lets software developers detect
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 9dbfefd9c224..aec332bbbdc8 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,5 @@
 DIST error-prone-2.16.tar.gz 2685946 BLAKE2B e10d38e5d0f6be102d64c4d24543f525c192300665a141d136d4bcb1db0e8553c16828411b60e2bca0d27a89fe7e094ac2fc2a367028091a4ad28b303c023a43 SHA512 c61d14e237ae45f3d1196e03ecdb5e77aa8aaa2f5983eee3667cc73951a12b1f0c85bd8a15c477c18fd517d486024d3b1f115928affb3697afc064d561b5f405
+DIST error-prone-2.23.0.tar.gz 2798856 BLAKE2B e6f9782700c54829cf0b99a1f2d8b6d0bdbb3a92b5ceb385a971b7b11fdccb8ecd0b042e163c6b66602626150681954cd1926e4dde1df7d01247dcdbbf3bf6d5 SHA512 7d45376b974090754d1bff7b749e5e1d060e9c901a7a9a12f28fffa3dcd2abcb29e82761c9b8eafaa43479cf390afe3a17ee21823a036aefdff3040ade313243
 EBUILD error-prone-annotations-2.16.ebuild 961 BLAKE2B 0d03f0709f5731a7123fb822d1f640cc0a63f3f327ed8b2f616b20edcd3b42fea72c9e45928fdf07e32c4cee673dac3e6784ac44b7868c676ea45fdac3f1c686 SHA512 608e1581f00c5b9cfb079a0f6fe5615cdb28074f19f16f9d87b5062cfedb2a34869a7e0bae9e31d861eeb4952e6e3ed2196be4df80e2c1227f3c49cf8dc4a5e6
+EBUILD error-prone-annotations-2.23.0.ebuild 716 BLAKE2B 8e1d6ef1c7b6d5aff4d59976b573b19b5fee5565f7474b15ebe92a6f546f9e0219ab12476a9a779fee3ae87587d470e42600fe4e8d6d58c88c17a39211a40c11 SHA512 9813aca94827ad17d58bb77a3f26a966e4944bc6c921aec13d72927d49422e610a7c68f5e2175c0c15461dd5acb4e9a8a9e38b6a1d2c58c201f3e19040cea855
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.23.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.23.0.ebuild
new file mode 100644
index 000000000000..fa814e5396d9
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.23.0.ebuild
@@ -0,0 +1,24 @@
+# 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.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="https://errorprone.info"
+SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
+S="${WORKDIR}/error-prone-${PV}/annotations"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest
index b733dde3c5d7..e3e3da8c8a9a 100644
--- a/dev-java/failureaccess/Manifest
+++ b/dev-java/failureaccess/Manifest
@@ -1,3 +1,5 @@
 DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
+DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec
 EBUILD failureaccess-32.1.2.ebuild 682 BLAKE2B 0a1b5efa6c1cb17ac46524308b8416e50c1fe0e8d33f65c84fd8322a8503d9350d0b599654488e8296cbc0431595c1076145c4811617a63becdef791243a7871 SHA512 14398310e2ef4b3832d8f50d63f58fa87ed83218d81c0411aee9a25f36a2abc071b5258f1d6ef8f8d16f5340f77566ebaa304bb5878c20dd2acdba3a9e88f4f9
+EBUILD failureaccess-32.1.3.ebuild 686 BLAKE2B 1adb3c27a80eda431b715105ce2a77dafb7f7e5e86bed8c73e9f9c2032c74c479331e2d310263d8b7a6f83deb733efc8ecb65beff3490f83e7e559ce476c76fb SHA512 1d6e68cc26123dc8baf8e9c01bcc226a41208d302189aeda39de99d0457fb21344d35081a4535f1bc4c986cac59c866c3b6baeb89562c0bcf431ca68f9a08263
 MISC metadata.xml 755 BLAKE2B af0cc772ea1dab11a52db3dad6ea865af7cfcda4189778c444810dc03162db63baa1a48379bc16b603669bbb7fbc7ed29db47fbefca65887cb8e05d9f1d87e03 SHA512 caeefc4d01c0e0864858fc7a2c50526df15c27a3ff39f3dd577e508d79893eba8c4849aa685ffcd35382b685b298e0626d44bddc62e960274c43e129abd70ece
diff --git a/dev-java/failureaccess/failureaccess-32.1.3.ebuild b/dev-java/failureaccess/failureaccess-32.1.3.ebuild
new file mode 100644
index 000000000000..2f7d9e9d055f
--- /dev/null
+++ b/dev-java/failureaccess/failureaccess-32.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=guava-${PV}
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:failureaccess:1.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes."
+HOMEPAGE="https://github.com/google/guava/"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 6e95cd6e35af..17d6fa279d73 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,4 +1,7 @@
 DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
+DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
+DIST truth-1.1.5.jar 244558 BLAKE2B c6a0889c9b50334d16cedff3974a1526b190b56a082d986dbcfce40c902a1d0e8689e387edc5b5f54f6b1ae079f2efd1e785398711b7b9363ed4dc6c1fe297f8 SHA512 b840a4ff9bd44189b0ada2770e53669b6368ad06b40a182d7ddb497866df872892f8ee5139f707f53b83cf0b860073f9d24a0f711dfb15b2f64b63e3f5013749
 EBUILD guava-testlib-32.1.2.ebuild 1299 BLAKE2B 65a8827d14fedecf990d663cc492819154f40555bf3bf05a2e8fdaedf439dc0c164202abb126b408d6491ab51c03cebe2b79d74a96099e9dd64e054d57f35039 SHA512 dcc87868edd97cb8d2f2d54d53768a80b554b6604351dc4d12660ac06c08f4541a3c01844893cb76f8f5ad9d21dc4c8c05bf274ff92a44794a818eedbfe5c97b
-MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
+EBUILD guava-testlib-32.1.3.ebuild 1293 BLAKE2B c217b6fec07a62f8e4a5544a158b67758edf7529332274e9e49470f718c1c9d7167a6a9426a5a884faaaf8fca1a71673904f2c77102d87b14687a0d9a2611fe7 SHA512 3e229fb613232ab12398fae7906422e80ecd2be4c70b682fd20a14456f0eb9a23de1ff64659879aacd81cbd6144d5239783a51ebaa35ae1d7cec8ea80ebe4245
+MISC metadata.xml 465 BLAKE2B 4219510a2bd85c049ada17dd780de974e3a972df9992cd693b52ae2b2d325342a8e70e233b2b884f8a07243da1abe0a1dc3affe1700f30b4093feb0e9ab07e95 SHA512 f7098be969eae6b094e54df6f05735dd6becf0dcdb19f28c5f7a675fe699e988655991f1846c9cb599b8932bfa1365e739ae762e8a0be8a83536e7fbbfa5e3e9
diff --git a/dev-java/guava-testlib/guava-testlib-32.1.3.ebuild b/dev-java/guava-testlib/guava-testlib-32.1.3.ebuild
new file mode 100644
index 000000000000..2c1391904986
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-32.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.5/truth-1.1.5.jar )"
+S="${WORKDIR}/guava-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/error-prone-annotations:0
+	~dev-java/guava-${PV}:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/checker-framework-qual:0
+	dev-java/j2objc-annotations:0
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
+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.5.jar:testdata.jar"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/guava-testlib/metadata.xml b/dev-java/guava-testlib/metadata.xml
index 8f8ff281cf6a..5dcc33c704ec 100644
--- a/dev-java/guava-testlib/metadata.xml
+++ b/dev-java/guava-testlib/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">google/guava</remote-id>
+	</upstream>
 	<longdescription>
 		Guava testlib is a set of java classes used for more convenient unit testing - particularly to assist the tests for Guava itself.
 	</longdescription>
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index fbd678b793b7..d4731e3fba02 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,5 @@
 DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
+DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec
 EBUILD guava-32.1.2-r1.ebuild 828 BLAKE2B 3053a4c8e577f74e430085bde63faea0c1de58c60510836dea63ddec283a12297c311cf922caf2e95e59cb230a6ad7367c357e008e8eec9edef88a7ed47d2a14 SHA512 cef4ff516e4b7a72b5ab0c59adb80a9c09bf8cd1250290af1fce22766436ad90e196286dfa2d37a18f2dcc148c60e0306893e1983a4b4eae19eded85dc233f27
+EBUILD guava-32.1.3.ebuild 871 BLAKE2B e96910c1d5454525ae3034de75f24637e35265b813de8b5f97528ab254bcc492820161c39eebcf2685c77540b0924b4b33803d8ab9a66b1e356ca9bab59d47f3 SHA512 318ebf8d1d070747b5a529ab61df4c55e25b58a5c0fe04076259187e9fa8b47d69c861401b7ac2a4f420a79d0373eba988dff5010e18f28dd553dec90e9a7c0c
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-32.1.3.ebuild b/dev-java/guava/guava-32.1.3.ebuild
new file mode 100644
index 000000000000..9ec51a5bec78
--- /dev/null
+++ b/dev-java/guava/guava-32.1.3.ebuild
@@ -0,0 +1,35 @@
+# 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/error-prone-annotations:0
+	~dev-java/failureaccess-${PV}:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/checker-framework-qual:0
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 338102bdc6cf..15750a886786 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,3 @@
 DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
 EBUILD guice-5.1.0.ebuild 2278 BLAKE2B 90567214c17a2e34c10ae83432e5f2cdd031ee325dcc381114df2c3b6c4bfbd3727b51bc37a722c27b5a3ab4f9fc621bc259aba3d1c03d8b4d21ef25442dc911 SHA512 7a1efdf154ccd4d96dc4c574fd9657a3863966706477b56be1bc71679829c25e69f87c9facca30a80d420b0ecacb066329746731d49f8f2064a41f4092f1413a
-MISC metadata.xml 371 BLAKE2B 2960f7040449f39cf4371b64df2a64fadfb000d042ccc4560d23cdc0f92cc4c55718a155990db42f7d1eebf1d8b5702e5094cca9bcb0e3e01cccf37e6509889d SHA512 522b9d8b6b85e48e522663cf9b93ee077b2adeb073795d5adb4df81935518dc8e712e85e2a4fc56e4ae1a0656ccc0b35831038afed7d65b880b80d1bffcbbec8
+MISC metadata.xml 314 BLAKE2B 096514ea3c668f82136fd956ee4df0fce9ed6c7b1b1b29988851c5e1e07a280df67186c7b036cc7db0440b668734068e08bf7d9465663a793e92bfda954b3a69 SHA512 24ccdea007adffcc8f5d26bd9dfaf19fb1b7ce74f936d2ac37e23874e68ae165310a3485ca1779698ede0b00f4549ed1c32b36f2eb61da1589c4e5f89090d460
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
index fbbc13fd826c..a8f059e86374 100644
--- a/dev-java/guice/metadata.xml
+++ b/dev-java/guice/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">google-guice</remote-id>
 		<remote-id type="github">google/guice</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index d9f45ad70ec3..b32d39f2061e 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,3 +1,5 @@
 DIST postgresql-jdbc-42.6.0.src.tar.gz 986703 BLAKE2B 24784805583d66f14370031015ff9c53faa2b512c5092b40294c8c1b7aa5e5128910a93f816138dc4a32fdd42dea165cc37c23c2f6d9b9aa5f36269d66e43d95 SHA512 8abf85b4be716ac94d312588d2bc69a56f803f3da573731ec66be0139b87eaa533965ad1431aa705ab17bf2b413b55a8ed038fa8181897df7c83582457449793
+DIST postgresql-jdbc-42.7.1.src.tar.gz 1000212 BLAKE2B 9c09931f15dc0a6dd72fec5148d6eea48226bc2af0de44111c8ea6c3ed798357139aa25c65cc3e6aea33e55201c86864c0e30f5c9b5eadbc980399fbc2f68e36 SHA512 a722415cb29551a59a830c6287873e9ba0cb75e1aa456175b8678caa96be871f42b9294c25a532a67109c7a7e48e3d6d7d5773e99ffb124019b1895430b213ef
 EBUILD jdbc-postgresql-42.6.0.ebuild 1772 BLAKE2B 0e7bbb699125d212e751b6fd699ee2a6c7b35ffdc09c44c8bdf3579827d351a40e1dcff4776ca64fed15ce3d7f824c59e0bd0537c3701e652dff9f406ef22ccb SHA512 eff1c578e4eab2d24cdd63a981bcbd58c177e642358e92952ede59facaf4d2d74142b37030ad68f0f917c3766101ee447431f917fc7e5e486c2e8faf323ef404
+EBUILD jdbc-postgresql-42.7.1.ebuild 1544 BLAKE2B 96662df901a44022df1034b8fcee9118cdda327c041b8803e589798ba44140a3e91097ad097614d19f5fbb2cddf436029238f34fc7543a0764b2f027be4ca561 SHA512 6e02265f6a9315c1895729e689ff78982335e7a40bde9249d113cdf970462ec0c7082e52106bcef7984fd5103d382e054ba0abfaaf9a331307475173f2a8f9bb
 MISC metadata.xml 295 BLAKE2B 1c8987c0d6f65d4e3019c2d6b8a0f8fac5f06e9144b118d3a0351f4a0e9b76ac4bc5b5ad678d92a691da7e8e8bb8c33f12d17d9dcc8b0ff007057d80307ebd24 SHA512 6a38ee7d2287a20ab89d7a92c59e74437877c4271cb38f00fccde9753c3caa8dccc3261fad23f81ec3dd2155f429aa4c3437bda024353640f8ed90ca096f9318
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild
new file mode 100644
index 000000000000..55916a3acb98
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.postgresql:postgresql:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
+HOMEPAGE="https://jdbc.postgresql.org/"
+SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
+S="${WORKDIR}/postgresql-${PV}-jdbc-src"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# package se.jiderhamn.classloader does not exist
+# package se.jiderhamn.classloader.leak does not exist
+# package uk.org.webcompere.systemstubs.environment does not exist
+# package uk.org.webcompere.systemstubs.jupiter does not exist
+# package uk.org.webcompere.systemstubs.properties does not exist
+# package uk.org.webcompere.systemstubs.resource does not exist
+RESTRICT="test" #839681
+
+DEPEND="
+	dev-java/checker-framework-qual:0
+	dev-java/jna:4
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/scram:0
+	dev-java/waffle-jna:0
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:5 )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="
+	checker-framework-qual
+	jna-4
+	osgi-cmpn-8
+	osgi-core
+	scram
+	waffle-jna
+"
+JAVA_AUTOMATIC_MODULE_NAME="org.postgresql.jdbc"
+JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	junit-5
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/waffle-jna/Manifest b/dev-java/waffle-jna/Manifest
new file mode 100644
index 000000000000..3364966addb7
--- /dev/null
+++ b/dev-java/waffle-jna/Manifest
@@ -0,0 +1,3 @@
+DIST waffle-parent-3.3.0.tar.gz 2147273 BLAKE2B a4f9c06898c50616013870bb383632d0b97e4f527da9b7b1acad9945f275181844d94b6533891a371f588115f60efdf791d5f64e03f938950a8dd48415f1f56f SHA512 e09154761dc5902e97b9dc57c9523bffe401fce33797346bbd5595390db3adaf5eed27d2ac7f98b7504aeb471c5f1a0c0a5104bd819a937e15c67123ecdd5891
+EBUILD waffle-jna-3.3.0.ebuild 1106 BLAKE2B 22d8efbc8f37ecef35151d28b99ace5504df0a16cf98ecf4db6250be8cb080ba09eb06a3f8c86489776fd3b73e335e195616f64d31f47fa82a7efe43210a4ea0 SHA512 f805ba33ad36b2fdff70d7e88585002bcda6d41999f96fe88b5590f0979cdc293b9bc19bec4fb61d2708b14ff9a1b1de73277ab239528be476402957f4f48adc
+MISC metadata.xml 295 BLAKE2B c3f5d90dd4d7e6ce9c822698bc14393d2ca79be23ee65590815387c0a2c31182daef030f3bd8c6555828cde35b060a92c39211a59dd6be9306aa332c564157c0 SHA512 016fa7ef4c7955fb436bcff36611bb38f960ba4ba05831f18c45e0411a43ab1dfee5bcddd4ea0ceefc8b3aecea6e5d5fb8caf02e8a46bc7827ca35ae11a9f165
diff --git a/dev-java/waffle-jna/metadata.xml b/dev-java/waffle-jna/metadata.xml
new file mode 100644
index 000000000000..a9d1f1367512
--- /dev/null
+++ b/dev-java/waffle-jna/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Waffle/waffle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
new file mode 100644
index 000000000000..43bce5918d49
--- /dev/null
+++ b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.waffle:waffle-jna:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Enable drop-in Windows Single Sign On for popular Java web servers"
+HOMEPAGE="https://waffle.github.io/waffle/"
+SRC_URI="https://github.com/Waffle/waffle/archive/waffle-parent-${PV}.tar.gz"
+S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" #839681
+
+DEPEND="
+	dev-java/caffeine:0
+	dev-java/checker-framework-qual:0
+	dev-java/jakarta-servlet-api:4
+	dev-java/jna:4
+	dev-java/slf4j-api:0
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:5 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="waffle.jna"
+JAVA_CLASSPATH_EXTRA="
+	caffeine
+	checker-framework-qual
+	jakarta-servlet-api-4
+	jna-4
+	slf4j-api
+"
+JAVA_RESOURCE_DIR="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	assertj-core-3
+	junit-5
+"
+JAVA_TEST_SRC_DIR="src/test/java"