gentoo auto-resync : 10:01:2024 - 13:02:42

22 files changed, 9 insertions, 373 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b8fbf8735445..25f2a2c1a862 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 29f861178e92..3fc9d00eb5ff 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,3 +1,3 @@
 DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7
 EBUILD aspectj-1.9.7.ebuild 2313 BLAKE2B 6ec1765f0b2018eb76c6d0d7094c907bd9cb07afbb0a03f45a218b477c01b6df5e8fede2564242cdef31927dcd5d08c1092ef44b3041a845658c41d89c4bea61 SHA512 daa24009e8c0d31da47b832f576edbe854c836819098487ba84d2e8618efb48e6b15440db0b0e1d76a0faa6b649f3a8f05f20c1bc6838089f7db63cb5ae376b2
-MISC metadata.xml 383 BLAKE2B c149ffc9749aead74e303a161c98d052328b8e5a7fc5c7f81f4ca7ff51ba6a5ba6d3456131ddb53d8d6339c211646f689f8712021485fec300f29d83952fe606 SHA512 33d9e6df4103d1fd3f10dcd95780325178b8cdebe4f747ae1983239fc8273c1a5461c7a763a9447556e3fb9641af000789235aefb5933698590f340865c2b161
+MISC metadata.xml 396 BLAKE2B 7e16ecf57d9457d8a88eb4c179ed0907d2fe1cacb084065cd2846de7250b959061c2e0c1ea9035c4d35a4db9ee7e96fde606ea9c9a114dab0a3edfbf7c4b37d1 SHA512 5f81510941874103c87b5816cc909eda8cab9fb7fd8c41055165f9291c0a46226d0053390405f629f4712ca071b0d56e18a06a3b33b253de48b6249e04f0cad1
diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index 5c762e7860f2..32a6a916de1c 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse/org.aspectj</remote-id>
-		<bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to>
+		<bugs-to>https://github.com/eclipse-aspectj/aspectj/issues</bugs-to>
+		<remote-id type="github">eclipse-aspectj/aspectj</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 2892cbf29c02..fed7d71a39ff 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,7 +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
 DIST checker-framework-3.42.0.tar.gz 8280060 BLAKE2B c2f7c192eb9a7a26b66e46f0c22c18a05ec8cc3c4c01d444e7f14e41c89db83b5d2738f78e3b16eea9cd9ebf3138171bbc6fabb195bdd9776defa06d75e516d6 SHA512 310578593509674b2d36353b2044009ac98b50906d715f1168a96490a1b87aa8227c1713f64adeabd98e370fb1a6a25dd148a5700ff6f4f28ba6b69ba505c149
-EBUILD checker-framework-qual-3.14.0.ebuild 731 BLAKE2B 57d49bd7011c294925573f2e71a225ae0b6ac054af1cb0b4da0fb2f363063df33d5372e6dde14b946740c18d95c62210f511a02591931c4ac4a9544ead1c8f97 SHA512 6f6a6b2965218142daa81ccc3435d9f53a7dfbd1cd9d1eab8afe26f0601075f611abc831ac6dc4e3d6ab48f7cd927d76fd8683f80e8f533d6c9bb236e3305716
 EBUILD checker-framework-qual-3.41.0.ebuild 678 BLAKE2B a86cdfb33ecb664b133a77c85737e187247cdd3f963d450be966b447892e56522348c634fc6cdd2a0d8bd46c1ed9e0435f337177541394898c82e190968c6725 SHA512 f7981af557a9e9a49e22453ac6851c1e110e88575fac0fa5d5cc1de043dd85eeb08b780204dd248884d86b3ac926f246c3f5212a8eb8f52482404fe62c667ef0
 EBUILD checker-framework-qual-3.42.0.ebuild 745 BLAKE2B 2337d8e29f915c7bf05d02afaa3e95c6dde5bd44aa25961f68b18d7d8fc9a60cfa69081e1499a6b504706bc3c7e6fe0379b4ec00caaf6a9f8f19d5ebb4155ae9 SHA512 14dd1c9b3815d688934f0c1c9d72176a167fb00cb406dc7d74b3b97c4143527c4a55c92d69adbbdc48a9c9f780bed7d0afe1e052c281fc23e9dd747e4e92a5cd
 MISC metadata.xml 651 BLAKE2B 2c53d072eaaaa7d09e5d185281efc9c897d1c8008dcbeb791c6b737614aa13f1091bda90b7fea33ff083c32dbd60dec180414af016af94850dee8b2bda8e865a SHA512 3428b96b3eac8b7416aabe2201af09c9bc4c444240ae682750573187a5ba137644aed7cfbcacb3a1162780a9eeb8544b0d6500cefc8f6e62f700271fe185a4d1
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
deleted file mode 100644
index 57becae21d2e..000000000000
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN%-qual}"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-JAVA_TESTING_FRAMEWORKS="junit"
-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://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}/checker-qual"
-
-JAVA_SRC_DIR="src/main/java/org/checkerframework/"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 338c9727f834..57afa40130a9 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,7 +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
 DIST error-prone-2.24.0.tar.gz 2808121 BLAKE2B a112cb2c2699b2522321c89f7875cf5978748f653225db2ce89dbca16eacb357689db79c1d584c034f987178e523baa07cedd43ecb96a53941cb2ebd3c26fe63 SHA512 9c3626c7d9e05a3dacf190c6e463b66ef5cb7b0de3b049884e243502ef7bb325c92433f2ac65dfcd72ddc0edada88dde0822c4fe91043de552d69f3b06611c26
-EBUILD error-prone-annotations-2.16.ebuild 961 BLAKE2B 0d03f0709f5731a7123fb822d1f640cc0a63f3f327ed8b2f616b20edcd3b42fea72c9e45928fdf07e32c4cee673dac3e6784ac44b7868c676ea45fdac3f1c686 SHA512 608e1581f00c5b9cfb079a0f6fe5615cdb28074f19f16f9d87b5062cfedb2a34869a7e0bae9e31d861eeb4952e6e3ed2196be4df80e2c1227f3c49cf8dc4a5e6
 EBUILD error-prone-annotations-2.23.0.ebuild 712 BLAKE2B 99050e2ed9e4eb840d608365b389cdabfafcad582f44f242804efa25a975c178acf49bfcc04b5c0ac7a888cf78878828c18776796ad1fd7c99a971db85452b02 SHA512 a6cc964b6902b645cb1cf5edef6661bcde977527c13f1c07c20733222406cb75387e4c55f378abe9035e3d1e71d161aba6af89e771826cecaf9c3a9df1ef82db
 EBUILD error-prone-annotations-2.24.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.16.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
deleted file mode 100644
index d000706c8189..000000000000
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 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/error-prone/archive/v2.16.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.16.ebuild
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/error-prone-${PV}/annotations"
-
-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 d9f7520676f8..4e3f7a6d0634 100644
--- a/dev-java/failureaccess/Manifest
+++ b/dev-java/failureaccess/Manifest
@@ -1,5 +1,3 @@
-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 682 BLAKE2B df28c0bf1938b689f4aaf70e015f7c88c80c09a307dec24562b5e300e339955b6f76369fa7bc08379f1c9ef609cdd4e55dc83c7254bc3f3350b05f7a2e2a666e SHA512 cdaa6af7bbc25b249451f74f702c112fba0cc36afe5573ca68d09c07627f323fdf12397586b24f83539042acbe5aa1a123384b8efc6afe0a6d90e5958e1c7b8e
 MISC metadata.xml 755 BLAKE2B af0cc772ea1dab11a52db3dad6ea865af7cfcda4189778c444810dc03162db63baa1a48379bc16b603669bbb7fbc7ed29db47fbefca65887cb8e05d9f1d87e03 SHA512 caeefc4d01c0e0864858fc7a2c50526df15c27a3ff39f3dd577e508d79893eba8c4849aa685ffcd35382b685b298e0626d44bddc62e960274c43e129abd70ece
diff --git a/dev-java/failureaccess/failureaccess-32.1.2.ebuild b/dev-java/failureaccess/failureaccess-32.1.2.ebuild
deleted file mode 100644
index fff769f48fc7..000000000000
--- a/dev-java/failureaccess/failureaccess-32.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 49d9de66276d..8cae7623f989 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,9 +1,6 @@
-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 guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c
-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
 EBUILD guava-testlib-32.1.3.ebuild 1289 BLAKE2B 78d3421bd7caae2c732874d8d0f97ef5dd38eda5fae443f1d827ebdcb32dac0adaecfbdf86d024cccc6dc4bb42713cf82d753885f261f140638714d530311db0 SHA512 79e4105294ccbc6c6196c59ce5ae7d32559bbc1cc12ff659cbcc83d9ed21aaf248c80532e0f00310b5b729efb29088a5d1d10d1fbcadc8bb02e5c35dc401a35d
 EBUILD guava-testlib-33.0.0.ebuild 1302 BLAKE2B e40d6034d0d23d01ab1f12e15a37d599f391ca9636e47b1382057ffbe86249f1a302d448c664ac109c328256d75ef4d86c32416115c1dd1a0156cf67af938bf5 SHA512 9d3bc59ff75a801ae8c386487489413082598e2c85fd7ad6b5c0419548cf4c2e4e3348bd74622da7e1d6ae32d05e27b21f1dcd3952bbb33b9e96eaa11ec2f18e
 MISC metadata.xml 465 BLAKE2B 4219510a2bd85c049ada17dd780de974e3a972df9992cd693b52ae2b2d325342a8e70e233b2b884f8a07243da1abe0a1dc3affe1700f30b4093feb0e9ab07e95 SHA512 f7098be969eae6b094e54df6f05735dd6becf0dcdb19f28c5f7a675fe699e988655991f1846c9cb599b8932bfa1365e739ae762e8a0be8a83536e7fbbfa5e3e9
diff --git a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
deleted file mode 100644
index f2a7f38e6762..000000000000
--- a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 11d4c8fc5043..134952dc3617 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,7 +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
 DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c
-EBUILD guava-32.1.2-r1.ebuild 828 BLAKE2B 3053a4c8e577f74e430085bde63faea0c1de58c60510836dea63ddec283a12297c311cf922caf2e95e59cb230a6ad7367c357e008e8eec9edef88a7ed47d2a14 SHA512 cef4ff516e4b7a72b5ab0c59adb80a9c09bf8cd1250290af1fce22766436ad90e196286dfa2d37a18f2dcc148c60e0306893e1983a4b4eae19eded85dc233f27
 EBUILD guava-32.1.3.ebuild 867 BLAKE2B 305346481cb6f4a4d312094161b29342efade542db7e02f37b5e30a644cb75fe5c2839f3e2b6517085a5a53657249cd1b8a8eaabf0c443f25bbec036fc102b39 SHA512 8f2dc776418d135119fbcf262e3e28bcc936d12e2d5d88e0f5e927ca5589a1b0abd83f530e3ee374899f6211ddc476940639730de2272857d1f7230309278d0a
 EBUILD guava-33.0.0.ebuild 904 BLAKE2B ba3362f8fbed8e6301fedef1e400cd02be2ca14a4e418d6ad796cb56a89ed713c5f6a75a6841ec2d9c0bc0b5d0788c6487cf141ccb6a091f0a7db532b881220c SHA512 01362d256972da16e94a76e75804db1262d473f0ee4a358d566d356f7f6dd28da251c423f62b980ae99d2d54614c0d5421be5b7517bab7d8e2f524a71453d410
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-32.1.2-r1.ebuild b/dev-java/guava/guava-32.1.2-r1.ebuild
deleted file mode 100644
index dfa306985777..000000000000
--- a/dev-java/guava/guava-32.1.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-${PV}: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/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 4792ec82ce2f..7490403db5f1 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,5 +1,3 @@
-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 1553 BLAKE2B 0e97c648f66e4fa2ada337e1e2a96eab1bfb75377362a0711ec8ffe4e5c2e49ebd207368c7d41c201f37f43b3c5b04d159b8d158bce32e7db0aca5a495620b74 SHA512 a39c54647bca6910d57a3802ba78a90e3e085b82056b21ce39307fe411b1b46635f1b8b2917cdb2e80897f1fa013d0397a11c5bd6a6ca8b03cca9379c51b5311
 MISC metadata.xml 295 BLAKE2B 1c8987c0d6f65d4e3019c2d6b8a0f8fac5f06e9144b118d3a0351f4a0e9b76ac4bc5b5ad678d92a691da7e8e8bb8c33f12d17d9dcc8b0ff007057d80307ebd24 SHA512 6a38ee7d2287a20ab89d7a92c59e74437877c4271cb38f00fccde9753c3caa8dccc3261fad23f81ec3dd2155f429aa4c3437bda024353640f8ed90ca096f9318
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild
deleted file mode 100644
index bafd90834dd0..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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://jdbc.postgresql.org/download/postgresql-jdbc-42.6.0.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.6.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.postgresql:postgresql:42.6.0"
-# We don't have junit-vintage and junit-jupiter.
-#	JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter 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"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.ongres.scram:client:2.1 -> >=dev-java/scram-2.1:0
-# uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
-
-CP_DEPEND="dev-java/scram:0"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.junit.jupiter:junit-jupiter-api:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? se.jiderhamn:classloader-leak-test-framework:1.1.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-		${CP_DEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-		${CP_DEPEND}"
-
-S="${WORKDIR}/postgresql-${PV}-jdbc-src"
-
-JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
index e4cd43c32ab0..d1e56fa62fc1 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1,5 +1,5 @@
 DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83
 DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B 25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b SHA512 4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21
 EBUILD json-smart-1.3.3.ebuild 677 BLAKE2B 089132dec7953a4be817a978d8c858e4bc795781235f280c687cbb2f77e30ab7e0d48cb3899e5f69bc68d916adbc29563202d5c8dc84b7fc31f6a72ea7dba288 SHA512 db7c3ae30ca5a871aab7ee28e898cfdef844e395bae3b35621ae79fa2b3485d0f694635efeb507fd03ebce679dbbec87e6f938b88f1b459f3e86a3a9eb6d4cc2
-EBUILD json-smart-2.5.0.ebuild 1632 BLAKE2B 847111b3851f15d9f63f23479f66d181ccc30c3489fd21cf81d4f229ee693740f6bc1770a940e7c4138ad4ae7c2b238d6dfa1c278b1bc5176a4c7a25049a363e SHA512 117e5dd77c5df558381fb2ef20551cfe7e9f2753cb434c5cc953f36dea109da5789430500dbdf9df68e5539526e8f6b1d46fa60c28efea278770768dbeb2de34
+EBUILD json-smart-2.5.0.ebuild 1631 BLAKE2B ddc6783294613b51a14c55a9b312c013c06d25fc12e8129e2995b6b4be7251e79cae2206b7f1deb72a9d137a79acefce33b06a383bb2c989b561c124b795ee46 SHA512 c870adca108357ab018e1a26fe800350861ce006d04b9b625aab770cb6041d947cf02249a921dd1e211a40a02040fc2920b9a3e90deb507ad84aded382ccf063
 MISC metadata.xml 642 BLAKE2B c365803a643b02f870ff0658d1184c227a243f1d9801ddfa9f5c487412f390a4714b75f461ad5b4acf589da5f0201df19e10126c5ccd2a2685c77edd5c774765 SHA512 f28271bf046bdcec40f7c8fa824d8eaf0d222c082412c08f9e9f3a766769d8c5c29e32cb4136f0722ae4400ce9fbf28776880c0d10903ccabe2a1d6953cee3ac
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild b/dev-java/json-smart/json-smart-2.5.0.ebuild
index 9b20d2f17507..04a95c02d05f 100644
--- a/dev-java/json-smart/json-smart-2.5.0.ebuild
+++ b/dev-java/json-smart/json-smart-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RESTRICT="test" #839681
 
 DEPEND="
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index fa33a9f848d8..3c065150926c 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -2,5 +2,5 @@ DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf74837767
 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
 EBUILD json-20220320.ebuild 1482 BLAKE2B 36157695be78f2cce807513e2525c1446f32618596d6a181c83cd8d9c4ebc139eacb2c314325352e49dfb9ec36d1a508c8fd5664522b956172de289706f2ef55 SHA512 aa15265508c64bc0486b911766cf988b2a6d38a50ef4519c7a60690278d533e9bcc4fb9f04084999da2022882f90220bceabd400408c3253bba4fdcb5bca2076
-EBUILD json-20231013-r1.ebuild 1495 BLAKE2B dcfff984d8ab15591a04a33a13616b8891d18f87367868b4e6a8d06c0f2be9fb65ae56ddc658fec2399904786de12fa3637ba9a02068e9a75207b67617254e9a SHA512 d8bef08486208085b2ec45125e5a0e3e7a72bd1989c5aba60873971cb2be3f07cf0f723e96019e2fef592951a601bd82df6d01eecb00ab770c4a1c6be57ade31
+EBUILD json-20231013-r1.ebuild 1494 BLAKE2B 3d43885a8994103e747a25ceb1506b443069e88ebd1bcc14f62d9f67bb6905a09e98c7cea205294f89755f50c292ab558e1dbf4ebb4d01d04a4783a53b5c5901 SHA512 8e790530ae9d77b53b45ee67c68bec7c1f57c448683203d48a91ff688addf7b059e6c69a19d481b1384c4ee92388dac6e4520d5f35b4180c50f79feb67c1fb13
 MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b
diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
index ff26a6b1c443..33b11fb0702e 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 4ef5ad6cc308..bd1c71853f2e 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,14 +1,10 @@
 AUX stringtemplate-3.2.1-TestStringTemplate.patch 463 BLAKE2B f4c9b1bce8b48a2d1299e866510a87038d34b636f2da942ca14e2ba9b75a77397abe7b430adcca35380d6362b5e3a6c6150f37b4e1efba521d1b63417cf7d4de SHA512 8f69547dd3e48ce32619f21daff19888f3cdf1d0df41e2f35ac534001c56eaa0e504edf481fd692241e2041c3d62f120df6ab4bb5b961f15662a399b9a915f8c
-AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
 AUX stringtemplate-4.3.4-BaseTest-javac-source-target.patch 1233 BLAKE2B abafe7d60c9667cb0838b33d67d9e4eee1afe9f5f989e2152fb03a5e88c402bda49b927320ad912990b617b6c60322e99417c5fad0c3e60d48b9e8bb4a69053d SHA512 fc5da02c16109817ab7bb30c31a90ce535560e8bf1e7e1dfb203846e930bbd665aeaf46a4641d67e2960e8ae9d88b21275317b0b6e0494eeac8f20aa4f546a04
 AUX stringtemplate-4.3.4-Java21-TestRenderers.patch 2293 BLAKE2B 48a0ac8fcf10dd67511c5f679c3194d980f22b3c4a471a200a6a5f228bdf5769bf0a89857dd29f0575e2648d71f79a15dd8b63f45bd01543497d5a0dbbd4e4c9 SHA512 094bd4c6f0678579b0f0419a5a2a6c7a1dac1c86602e137d0b66da7d4a49ab4faa85d26b20266a54b3106964521cb33f6690aaa6265a1348fddc0fe3b93eaa74
-DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d SHA512 83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878
 DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517 SHA512 5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2
 DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba98888bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57 SHA512 8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1
 EBUILD stringtemplate-3.2.1-r3.ebuild 1453 BLAKE2B 21864c434a6d4bd30706ecb52ac4bf74ea95796479288f6112c303918f64aa1cefb5d2ec1bf9cf9e3de0471be049ef2ae5d7beab3e93dee0e43223fd400a6e98 SHA512 63d481137f9254f98921386ce84b213ac36cc9a40b09ad31d600415c84eae37be6bb24187c02bed39cd7e791bfeff1eef9bf68ff22dc5046b31e6f536a29db0b
-EBUILD stringtemplate-4.3.2.ebuild 3267 BLAKE2B e8468a2985540109fa1159d5cc853607cbca7ea712b139d90a6a222c3364ea5d92c9d16003abc5bb7986d4d6037651805f2ccc4419c70d47f4329af8374926bf SHA512 fc353764974ea280a98c9f7aed22c532071cbfa527fe729af3bc1047950388b715638ac249034affe7ceaad88b311780d25dbd5e66dc9ac532aa5e96947861be
 EBUILD stringtemplate-4.3.4.ebuild 3075 BLAKE2B 0bb4e03971e0eaf7e075335ab9beb80f9a1d4aaf2b7410590745b1559aba0992978b366899fe7b7ae6cc8c932c01f5deca852e75d8f3a5c1434095a73ecd764d SHA512 20133120b08e0bbcc172029594f0038a227d45312ce2f092b0405017f7a9cffb12a73f0399bfe3955a8f6f7ac53c191a19e378a89695ad83752d101bb2987ae3
 MISC metadata.xml 384 BLAKE2B 16689f763ad8d9c0ce861933ca359a87ff74e2b464b740989a12700c9ad9eb8b2a79b0dd4ca6a2aecfe908b107c6abd907e1a25775783ea911a4a76fdf0d6e19 SHA512 71e70442b1128c1fbddc8ea936584090bf17ab8ecefc0ad35674b7d04bbab4f9981e0b2ea3465a386d43cc3363710fcf0bfd78412f29f387e85b5ebad998dbea
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
deleted file mode 100644
index 5824425ce35b..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Mon, 24 Jan 2022 06:17:03 -0800
-Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
-
-JDK 17 no longer supports 1.6 as the source or target version.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/org/stringtemplate/v4/test/BaseTest.java b/test/org/stringtemplate/v4/test/BaseTest.java
-index 536d686..74a3949 100644
---- a/test/org/stringtemplate/v4/test/BaseTest.java
-+++ b/test/org/stringtemplate/v4/test/BaseTest.java
-@@ -258,7 +258,7 @@ public abstract class BaseTest {
-             fileManager.getJavaFileObjectsFromFiles(files);
- 
-         Iterable<String> compileOptions =
--            Arrays.asList("-g", "-source", "1.6", "-target", "1.6", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
-+            Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
- 
-         JavaCompiler.CompilationTask task =
-             compiler.getTask(null, fileManager, null, compileOptions, null,
--- 
-2.34.1
-
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
deleted file mode 100644
index 86fa55098e53..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:ST4:4.3.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires antlr-tool-3.5, which depends on this package.
-# Tarball for the test suite and DOCS files
-SRC_URI="
-	https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
-	https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-CP_DEPEND="
-	dev-java/antlr-runtime:3.5
-"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/antlr-tool:3.5
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
-JAVA_SRC_DIR="org"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
-JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
-
-DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
-
-src_prepare() {
-	# Do not call java-pkg_clean; otherwise, it would remove
-	# ${TARBALL_S}/test/test.jar, which is merely used as a
-	# test resource file, does not contain any *.class files,
-	# and is required to pass the tests as of version 4.3.2
-	pushd "${TARBALL_S}" > /dev/null ||
-		die "Failed to enter directory storing tarball contents"
-	eapply "${FILESDIR}/${PN}-4.3.1-BaseTest-javac-source-target.patch"
-	popd > /dev/null ||
-		die "Failed to leave directory storing tarball contents"
-	java-pkg-2_src_prepare
-	# Some of these tests requires a graphical display.
-	rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
-}
-
-src_test() {
-	# Make sure no older versions of this slot are present in the classpath
-	# https://bugs.gentoo.org/834138#c4
-	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
-	local new_test_cp="$(\
-		java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
-	new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
-
-	# Some of the test cases require an absolute path to the JAR being tested
-	# against to be in the classpath, due to the fact that they call the 'java'
-	# command outside ${S} and reuse the classpath for the tests:
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
-	new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
-
-	# The JAR used as a test resource file needs to be in the classpath
-	# https://github.com/antlr/stringtemplate4/blob/4.3.2/pom.xml#L53-L58
-	new_test_cp+=":${JAVA_TEST_SRC_DIR}/test.jar"
-
-	# Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
-	local JAVA_TEST_GENTOO_CLASSPATH=""
-	[[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":"
-	JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}