From 5cb44befdbb68373f131889e6d6bf287330c66c7 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Mon, 20 Nov 2023 13:28:05 +0100
Subject: [PATCH] dev-java/eclipse-ecj: fix runtime error (slot 4.29)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 ...4.29.ebuild => eclipse-ecj-4.29-r1.ebuild} | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)
 rename dev-java/eclipse-ecj/{eclipse-ecj-4.29.ebuild => eclipse-ecj-4.29-r1.ebuild} (69%)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
similarity index 69%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
index 5fcf19d5c6d82..6ea7cb328bd8b 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
@@ -20,22 +20,25 @@ 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"
+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}
-	>=virtual/jdk-21:*
-	app-arch/unzip"
+	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:*"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
-JAVA_GENTOO_CLASSPATH="ant-core"
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_CLASSPATH_EXTRA="ant-core"
 JAVA_JAR_FILENAME="${MY_PN}.jar"
 JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
 JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
@@ -55,6 +58,14 @@ src_prepare() {
 		| 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"
+}
+
 pkg_postinst() {
 	einfo "To select between slots of ECJ..."
 	einfo " # eselect ecj"