Adding metadata

18 files changed, 5 insertions, 361 deletions

diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index ebe19d580eec..1d045bb286d5 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to>
+  <bugs-to>https://github.com/eclipse-aspectj/aspectj/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 54bfef232061..41221a2283c8 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,3 +1,2 @@
-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
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 be281714043e..ab3a20bd914c 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,2 @@
-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
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 db28d6a8a551..8b31a66a0288 100644
--- a/dev-java/failureaccess/Manifest
+++ b/dev-java/failureaccess/Manifest
@@ -1,2 +1 @@
-DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
 DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec
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 cbbf5d597a4d..6be0b92219e5 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/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
 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
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 04ccc29e8c65..595942b31c26 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,2 @@
-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
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 d549c180bf75..ac27a538f20a 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,2 +1 @@
-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
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/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/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 a3cd15fbf1b0..99391fd2990b 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,6 +1,4 @@
-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
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
-}