gentoo auto-resync : 24:11:2023 - 16:33:11

16 files changed, 203 insertions, 270 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5cd3600aadee..0afb8f61fd8d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 33c0aa62b047..7d925270028d 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,13 +1,7 @@
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
 AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
-AUX ecj-4.27 402 BLAKE2B 958e72a31f04f0b28f856b1cc82b8014365f579b60a33e05931f5831cc174ae562221aeca58d9272df3c383092824fd9a6d15dbcba16dfbb0d80500b839c34e3 SHA512 85b6ebb23b4ed49ea76661a34e59db52d12e9fdb464531691b7ac6aa5069715a490965222c524cbb05153e526e8f6247a08cdacf6545fcab842255f6b8b61730
-AUX ecj-4.29 402 BLAKE2B e741a244cce88c5bf7148ee3fae170e11bd93e3f4fb20186ca5b67a0986d11b8c4a50a038d2d421324c68fff651104132c6dfaf44c21849b6808c25a8415e5bf SHA512 c7db80ffb28582704ff553a816a578b79a707abf7e28ed6c89d525f9e60c7da4236e162d427301436e20e5bee3d95c91c82db1d1570c9ef531b6f13cc26368cc
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
-DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
-DIST ecjsrc-4.29.jar 2319437 BLAKE2B 2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91 SHA512 d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1264 BLAKE2B 69b2683dbf261cfa42366352f567326bef3ee90368899ce57b58541df7de181dd34b018b59e66cf5cef7846fcd03302eced7669b64b653a83c4169a72a6f7bcb SHA512 a275af869a5421975047a752121be71bccef71a23567c11a2fea71c2f574d198c0cd4284f5bd9527fbe0a7ccbd24fcfb6e9e61bb9fcd283d872c94911940d5a2
 EBUILD ant-eclipse-ecj-4.26.ebuild 1420 BLAKE2B a8b84c31f5921f47234544ccfb594b081a07cb42e8e6a31346ea5f69e00fb5fcd586700afa421043f25393416c31a8cd6a60cfa1c8ff14f71edc44d4e49ecc0f SHA512 7087a4dcb93b0b87d512ba018817fcb613030d4ddbbfe4835b948da1281460d468ea5273bdedd1ee101e3fa6823a1623a3b76fc4ca2135b01441933558afd183
-EBUILD ant-eclipse-ecj-4.27.ebuild 1411 BLAKE2B 87ec571a7dfea0bc09ff26954b622087cdf2c9eb89474a3a3734f9ca3fc31757b1a8653474c18116f87dac4f301dcc83636610d63926411dab18e7e7e91b113c SHA512 22c095240582029db60b7036e4c16f043ebda96f96f8e142abbda1c18328b57f024660e9dedeef69ada3e6cddcfcb2f9edbfc8dcc1efec8a312207d48a026235
-EBUILD ant-eclipse-ecj-4.29.ebuild 1411 BLAKE2B 31047ce3401b5c318f6782efdd50bcb9c4469b697e414e7b4947e9373632fd720165a69a64d8cbb2aa29fd4126ce7017fd962793e7eadf34a13bc5ec4af6bc69 SHA512 4862792eaa3fbde291e044dc8b770027af21388578270e62bb2e56dd91c32656f9482f59642823421282ec3c54d4da8dc540e4faef5ff0d221c9cd170deae36c
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
deleted file mode 100644
index 015b0f144035..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202303020300"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.27"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
-	dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
-	>=virtual/jre-11:*"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# Remove everything but the Ant component.
-	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
deleted file mode 100644
index 15e5b9477ade..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202309031000"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.29"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
-	dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
-	>=virtual/jre-11:*"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# Remove everything but the Ant component.
-	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 8cdbe9a23a13..74fa7d53d9db 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,9 +1,11 @@
+AUX ecj-4.27 402 BLAKE2B 958e72a31f04f0b28f856b1cc82b8014365f579b60a33e05931f5831cc174ae562221aeca58d9272df3c383092824fd9a6d15dbcba16dfbb0d80500b839c34e3 SHA512 85b6ebb23b4ed49ea76661a34e59db52d12e9fdb464531691b7ac6aa5069715a490965222c524cbb05153e526e8f6247a08cdacf6545fcab842255f6b8b61730
+AUX ecj-4.29 402 BLAKE2B e741a244cce88c5bf7148ee3fae170e11bd93e3f4fb20186ca5b67a0986d11b8c4a50a038d2d421324c68fff651104132c6dfaf44c21849b6808c25a8415e5bf SHA512 c7db80ffb28582704ff553a816a578b79a707abf7e28ed6c89d525f9e60c7da4236e162d427301436e20e5bee3d95c91c82db1d1570c9ef531b6f13cc26368cc
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
 DIST ecjsrc-4.29.jar 2319437 BLAKE2B 2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91 SHA512 d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f
 EBUILD eclipse-ecj-4.15.ebuild 1736 BLAKE2B c2bb6e3bf06c39d5633c9db215b9ff3047c83c6fb3377281e91e6eae40418e3a34154f7afa3c19edee5411ef08794fcb8fc84e1f2f9eb3c8d0e376bf69c99296 SHA512 b9db554f95148e810076ad3d86abd5f76a4a9942e33def4e31753847e59a7b682088456b7b20e9a1e7a4dc199a7687bd3ea8dfae4fdf691950a737ef2a4f31b6
 EBUILD eclipse-ecj-4.26.ebuild 1691 BLAKE2B 108efc14612f98445a7d8c16145fbb493e15ff39f79feef992ff46dd64a07354b181c6f385f0a6a1282ea5b23c96e65646ce1d326ef43e06e89d4d5ef6a22f09 SHA512 2ff8e9c4337d594e5ef72cdc97451330e42ea47e1df3e18d827adadad07407eed6e7e70fe9a3688e7b41faff966f5d6716c5705dafb9fbcb5c43ec41887b57f0
-EBUILD eclipse-ecj-4.27.ebuild 1563 BLAKE2B 19eb644f98d9be503480c51963c561eb7f762df1f87bccd41afc26374ee185fedbeb6abe35e2d90beacc7d27c5fc5e3e7fd43fcb96fbca67246e49def24cec3a SHA512 357d7e5b88641261ca1ae96794a724348350de4c3fd374b489b41e4dfa81d3a869f3af5021fde7be8b8233715e5cacec81dc612db78675509ec83ce5e5da4ca8
-EBUILD eclipse-ecj-4.29.ebuild 1654 BLAKE2B 2d5df60d052d938a693963b0ec75e72988f06964fa8366bf3d7ae60862384f39729b7eb6f9723469d16c13c1f6b45ca9da41fc8232b995e4ea670688c884e0c3 SHA512 f81eb30fca7c018520efddab800e18f0538dfc317955e8d53359beaad115d38b4713341c5b3d7259f8da499b43bb7e5afc5c7a103176535a25d002cbdc022ef0
+EBUILD eclipse-ecj-4.27-r2.ebuild 2189 BLAKE2B 3974d2fe77cd54fd5130af8f4bd7685538057ce730a15a143e04b75d73707c8a5dd6f53d54d46388fa03d29379b1e4c474899e8360cd929e1866e2527c4bb040 SHA512 c56309ab10ac6d519e43c38ec705d6532634e250db834d05d1357b433cbe37dac164d00a5e0b77ddea7770e923a15dda068eb913af1a88e6534db71a07c1788d
+EBUILD eclipse-ecj-4.29-r1.ebuild 2280 BLAKE2B 94a425203d784c595081b178b3f7bd7c32331a7130ae1d45601d9b6d0d4127991c09bbeec0d3a3f19da33d4c8b8d01db8fc35a401abb37dd94776650d3c868b7 SHA512 5f796ddc565c72b638f7ccdbfd43135488ec2ddbcd4596df72065d4995883beff9e801d956fbc7cbfe0a9eebfaa0c3ea05160d1d81ff7c5c05c2a5316d175aad
 MISC metadata.xml 747 BLAKE2B 734d84847d4c2670a042e4636188d5c0e6f333a653933fa9365ae87477adc439a9a77362307b144c72077b68cfa6e9e8068989f021147ea9fa68a86a989f4c62 SHA512 22d6f55ee210dc62f7463692726b82b4ea30a67fe4debb6860fab53b227b7254874b8c3364add8ff9d9b62dc3e35b500b61faa7f999fa61460b2a94d56759cc0
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
new file mode 100644
index 000000000000..c71988b8619d
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.33.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_27/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.33.0"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202303020300"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.27"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+"
+COMMON_DEP="app-eselect/eselect-java"
+# ElementsImpl9.java:206: error:
+# method does not override or implement a method from a supertype
+DEPEND="${COMMON_DEP}
+	dev-java/ant-core:0
+	>=virtual/jdk-21:*"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-11:*"
+
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	find -type f \
+		! -name '*.java' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	# Error: A JNI error has occurred, please check your installation and try again
+	# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+	zip -d ecj.jar "META-INF/ECLIPSE_.RSA" || die "Failed to remove ECLIPSE_.RSA"
+	zip -d ecj.jar "META-INF/ECLIPSE_.SF" || die "Failed to remove ECLIPSE_.SF"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
deleted file mode 100644
index fb56b1b9116c..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
+++ /dev/null
@@ -1,65 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-202303020300"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.27"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-# ElementsImpl9.java:206: error:
-# method does not override or implement a method from a supertype
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-21:*
-	app-arch/unzip"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11:*"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
-JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
-JAVA_RESOURCE_DIRS="res"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	find -type f \
-		! -name '*.java' \
-		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
new file mode 100644
index 000000000000..0de20cf2511c
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.35.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_29/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.35.0"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202309031000"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.29"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+"
+COMMON_DEP="app-eselect/eselect-java"
+# ElementsImpl9.java:206: error:
+# method does not override or implement a method from a supertype
+DEPEND="${COMMON_DEP}
+	dev-java/ant-core:0
+	>=virtual/jdk-21:*"
+# Parser.java:1095: error:
+# pattern matching in instanceof is not supported in -source 11
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-17:*"
+
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	find -type f \
+		! -name '*.java' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	# Error: A JNI error has occurred, please check your installation and try again
+	# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+	zip -d ecj.jar "META-INF/ECLIPSE_.RSA" || die "Failed to remove ECLIPSE_.RSA"
+	zip -d ecj.jar "META-INF/ECLIPSE_.SF" || die "Failed to remove ECLIPSE_.SF"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
deleted file mode 100644
index 5fcf19d5c6d8..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
+++ /dev/null
@@ -1,67 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-202309031000"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.29"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-# ElementsImpl9.java:206: error:
-# method does not override or implement a method from a supertype
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-21:*
-	app-arch/unzip"
-# Parser.java:1095: error:
-# pattern matching in instanceof is not supported in -source 11
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-17:*"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
-JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
-JAVA_RESOURCE_DIRS="res"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	find -type f \
-		! -name '*.java' \
-		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.27 b/dev-java/eclipse-ecj/files/ecj-4.27
index 7b66f97ff0c7..7b66f97ff0c7 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.27
+++ b/dev-java/eclipse-ecj/files/ecj-4.27
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.29 b/dev-java/eclipse-ecj/files/ecj-4.29
index 4cb14c005ddf..4cb14c005ddf 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.29
+++ b/dev-java/eclipse-ecj/files/ecj-4.29
diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
index bc9b1512ede2..757220faa050 100644
--- a/dev-java/java-diff-utils/Manifest
+++ b/dev-java/java-diff-utils/Manifest
@@ -1,3 +1,5 @@
 DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62
+DIST java-diff-utils-parent-4.12.tar.gz 2080632 BLAKE2B 36cb824bd00e946484dc62b3d5739620eeff6f509cdfa3f521144c21ea9d5de43ccc838700d3d9d116817dc1256d90fe1bdb552b02a2c7cff1e6b702b889f8d0 SHA512 0ac8f633e01f70b6c0f243b65c95716a1237142abde96eed3211a5ee5afb5bf721e936a67b4e2ce27e1df34a8402d0fbcb830e0557bd32cd24a7529d80e61e5c
 EBUILD java-diff-utils-1.3.0.ebuild 974 BLAKE2B 9982ede579ca2fe6578df3844a86c237d61276678f9b37ed0c5bb3afab2311a0396c8101aa7374085572e4cc49dc73b3be896b5bc8c50a1eefcaeda25d9ff461 SHA512 af4f3e6cc0a72e2719604650f90347760e3c778995e96d5b03bd2522bdbe4a39c881415e4873baa73b61fc8bc835578f01ea67e54a9790a9cdd8004becbf56e7
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+EBUILD java-diff-utils-4.12.ebuild 1004 BLAKE2B 9dbbb1b0f9f48bf42bc884cace63f25fd1a9aded3f75cb829729e82283a7621ed14ee385d99944268f8378c94331c2f35c7481fe4eb8291bad2ee5d69f06d31d SHA512 b778313106faa1e8124b9f762160eef632ee87971e94fbeff3f45c1c390b8bf179c18410800162f640b42a5cb646bb7333941f2ac0bd85804ac34e3896f9e123
+MISC metadata.xml 313 BLAKE2B d36ca69273ccafdd633c6f869c19781c4cef27c2947c7461b4c5285cb4f4f68d5896e63e2e12d069a6123b8ede70b891fd55fa583ff9aced04a1672c03a1982d SHA512 071ee6a67e35fc932046c8d22fdd7ba058bcb0630bb528ea8eab675b1df314635e9c8671313c1fef2139cb505f7fb6be2f229643f8833938dd86463fcaa7a056
diff --git a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
new file mode 100644
index 000000000000..bb67109d452d
--- /dev/null
+++ b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
@@ -0,0 +1,33 @@
+# 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="io.github.java-diff-utils:java-diff-utils:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view"
+HOMEPAGE="https://java-diff-utils.github.io/java-diff-utils/"
+SRC_URI="https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-${PV}.tar.gz"
+S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RESTRICT="test" #839681
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="io.github.javadiffutils"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	assertj-core-3
+	junit-5
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/java-diff-utils/metadata.xml b/dev-java/java-diff-utils/metadata.xml
index 75321cfb5598..4df5c7c25054 100644
--- a/dev-java/java-diff-utils/metadata.xml
+++ b/dev-java/java-diff-utils/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">java-diff-utils/java-diff-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index ef8139c135f0..2314dd5ca90d 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -4,7 +4,6 @@ AUX 1.1.7.8-remove-perl-usage.patch 1720 BLAKE2B f6e1462356bfa94e946fb2e8a4200bd
 AUX 1.1.7.8-unbundle-bitshuffle.patch 1006 BLAKE2B 99b88fd2af02ff6d95d90ec2e302593c7ae00691156b283e11425677f904847d2809ce91d7094de8a5ec759595e721bf0f80d3deadd56f0f05e8d4ae1d4c4613 SHA512 dd4877f023095f7d41e6d22213d1916ae17ec8a88977354d5e1662fa3e555f89bc27def9537cd6ffd07a75794c25719379189b14a0db481df1c2e729525b12f0
 AUX 1.1.7.8-unbundle-snappy.patch 1820 BLAKE2B ec2f5724675cef1a796678f5b12ccd4b49c2415fcfd98e2a3f9214bb63477bfd9bed93999c2f12b2f0e8b5aedb705299bf37e52a16833797a745bf4e1eeecdd9 SHA512 408c09f01cb65dcf17b7ecd5542cd622b6296ab6d433be79ff2a8d03dc4e8f8b9c48165d95afa0b865c8ab196c4470e93f5b07e9eeded1f492d1ef2d8d91fa82
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
-AUX snappy-1.1.10.1-SnappyOutputStreamTest.patch 1148 BLAKE2B 38fd8aa64068351a6296c2abd1835b8106d22bffc418dae29ac806d472809fb924f7c3a909d7d7dfd1687c0c62be50968d0a9a864d65c522f78b15f644a077c4 SHA512 d9b72e0b7ca85d0ee907d36ffb63e33b26408ce2619f99e3fde9c0f06f25d492be7f7b20c7bb3c00038da8ef40a73492f65d15eb51261d8466d2e855b152ccfa
 AUX snappy-1.1.10.1-commons-lang3.patch 507 BLAKE2B 17a9219e4e9fbcf8900dff8ce06762262d5d40ac07861d895ba29da8a2583ce37c011b04892382359a86c79ffff77ceac36d0f8fcca420fc20011d3411f9078a SHA512 2c08bbf6fe408778233a1194df72182a5cf4083b8647f9baea740b9fb403f31e001e1671913992624465d2e7d7197142ea47cc4891d64124fc54ac95a9d9accb
 AUX snappy-1.1.10.1-unbundle-snappy.patch 1928 BLAKE2B cc67a38e53dcd08d208b33796a003d7ca73f79a54a8d0a4411de9f15aae1e09e079bc55c9230964e990f8a27e4be3872e9d5092fe7abb5af760ce91641b753c1 SHA512 78cef705a76c379ec7cc59e4f4c6012bbba5f54b4a24172b7ab2ef0ccd7a8e22cf3e469938c9dca5933e066990c3e973893c0c93368fecd90486010f9b8ad69f
 AUX snappy-1.1.10.5-SnappyOutputStreamTest.patch 1215 BLAKE2B 34005766546b28012ffbd86927b37d9368eab212b3fc2252492f2c49f7b639519cdf5bd197fb7dce3769108bab1175414f0b9287cf4893d41ad784e9f27ae8c0 SHA512 3c65030686fcdd1177c6865894510081ba41631db9c3945c52aeef921ccf049fa65083225af9f022a1537814e8a50de2ad0740292b9d6d8e8ee900176ff69267
diff --git a/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch b/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch
deleted file mode 100644
index add60f632e55..000000000000
--- a/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-1) batchingOfWritesShouldNotAffectCompressedDataSize(org.xerial.snappy.SnappyOutputStreamTest)
-java.lang.AssertionError: expected:<91080> but was:<91051>
-	at org.junit.Assert.fail(Assert.java:89)
-	at org.junit.Assert.failNotEquals(Assert.java:835)
-	at org.junit.Assert.assertEquals(Assert.java:647)
-	at org.junit.Assert.assertEquals(Assert.java:633)
-	at org.xerial.snappy.SnappyOutputStreamTest.batchingOfWritesShouldNotAffectCompressedDataSize(SnappyOutputStreamTest.java:171)
---- a/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
-+++ b/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
-@@ -34,6 +34,7 @@ import java.lang.ref.WeakReference;
- import java.nio.ByteOrder;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.xerial.snappy.buffer.BufferAllocatorFactory;
- import org.xerial.snappy.buffer.CachedBufferAllocator;
- import org.xerial.snappy.buffer.DefaultBufferAllocator;
-@@ -153,7 +154,7 @@ public class SnappyOutputStreamTest
-         return b.toByteArray();
-     }
- 
--    @Test
-+    @Ignore @Test
-     public void batchingOfWritesShouldNotAffectCompressedDataSize()
-             throws Exception
-     {