From 391bc1ea006428d5f5d004e15da41ecfb54c11c5 Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Mon, 26 Feb 2024 18:40:22 +0000
Subject: Adding metadata

---
 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild |  2 +-
 dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild | 65 ----------------------
 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild | 73 +++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 66 deletions(-)
 delete mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
 create mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild

(limited to 'dev-java/eclipse-ecj')

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index 753425431bb8..6f1440c1f82f 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 SLOT="4.15"
 
 BDEPEND="
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
deleted file mode 100644
index 6a8632e9feb6..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 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}-202211231800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-SLOT="4.26"
-
-BDEPEND="
-	app-arch/unzip
-	app-arch/zip
-"
-COMMON_DEP="app-eselect/eselect-java"
-DEPEND="${COMMON_DEP}
-	>=dev-java/ant-1.10.14:0
-	>=virtual/jdk-17:*"
-RDEPEND="${COMMON_DEP}
-	!dev-java/ant-eclipse-ecj:4.26
-	>=virtual/jre-11:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
-JAVA_CLASSPATH_EXTRA="ant"
-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 org META-INF -type f \
-		! -name '*.java' \
-		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
-}
-
-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.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
new file mode 100644
index 000000000000..8843146e1f91
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 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}-202211231800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ~arm ~arm64"
+SLOT="4.26"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+	>=dev-java/ant-1.10.14:0
+	>=virtual/jdk-17:*"
+RDEPEND="${COMMON_DEP}
+	!dev-java/ant-eclipse-ecj:4.26
+	>=virtual/jre-11:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+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 org META-INF -type f \
+		! -name '*.java' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	#925083
+	# 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
+}
-- 
cgit v1.3