From 96ebbfec0561965f28ae3be7c2e89c997dc19767 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Fri, 24 Nov 2023 13:15:00 +0100
Subject: [PATCH] dev-java/eclipse-ecj: (slot 4.27) merge ant-eclipse-ecj
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Applies same logic as from slot 4.29

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 ...7-r1.ebuild => eclipse-ecj-4.27-r2.ebuild} | 36 +++++++++++--------
 dev-java/eclipse-ecj/files/ecj-4.27           |  7 ++++
 2 files changed, 28 insertions(+), 15 deletions(-)
 rename dev-java/eclipse-ecj/{eclipse-ecj-4.27-r1.ebuild => eclipse-ecj-4.27-r2.ebuild} (59%)
 create mode 100644 dev-java/eclipse-ecj/files/ecj-4.27

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
similarity index 59%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
index 0c8b3763125d5..c71988b8619d3 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
@@ -4,25 +4,27 @@
 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
+inherit java-pkg-2 java-pkg-simple prefix
 
-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"
+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"
-IUSE="+ant"
 
 BDEPEND="
 	app-arch/unzip
-	app-arch/zip"
+	app-arch/zip
+"
 COMMON_DEP="app-eselect/eselect-java"
 # ElementsImpl9.java:206: error:
 # method does not override or implement a method from a supertype
@@ -31,26 +33,21 @@ DEPEND="${COMMON_DEP}
 	>=virtual/jdk-21:*"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-11:*"
-PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
 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="${MY_PN}.jar"
-JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${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 org META-INF -type f \
+	find -type f \
 		! -name '*.java' \
 		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
 }
@@ -58,7 +55,16 @@ src_prepare() {
 src_compile() {
 	java-pkg-simple_src_compile
 	# Error: A JNI error has occurred, please check your installation and try again
-	zip -d ecj.jar "META-INF/MANIFEST.MF" || die "Failed to remove MANIFEST.MF"
+	# 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() {
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 0000000000000..7b66f97ff0c7a
--- /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"