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

7 files changed, 178 insertions, 134 deletions

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/eclipse-ecj/files/ecj-4.27 b/dev-java/eclipse-ecj/files/ecj-4.27
new file mode 100644
index 000000000000..7b66f97ff0c7
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.27
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.27"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.27*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27,ant-eclipse-ecj-4.27"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/ecj-4.29 b/dev-java/eclipse-ecj/files/ecj-4.29
new file mode 100644
index 000000000000..4cb14c005ddf
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.29
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.29"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.29*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.29,ant-eclipse-ecj-4.29"
+GENERATION="2"