From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B3F4158099 for ; Fri, 24 Nov 2023 11:14:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92F602BC034; Fri, 24 Nov 2023 11:14:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DCB32BC02A for ; Fri, 24 Nov 2023 11:14:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8976833FD24 for ; Fri, 24 Nov 2023 11:14:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6E9B13BB for ; Fri, 24 Nov 2023 11:14:41 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1700824477.5cb44befdbb68373f131889e6d6bf287330c66c7.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild X-VCS-Directories: dev-java/eclipse-ecj/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 5cb44befdbb68373f131889e6d6bf287330c66c7 X-VCS-Branch: master Date: Fri, 24 Nov 2023 11:14:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b62e1c65-8a03-4bc3-9774-0456e28669da X-Archives-Hash: 260c6e64a79dbb349928991cb78b6cde commit: 5cb44befdbb68373f131889e6d6bf287330c66c7 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Nov 20 12:28:05 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Nov 24 11:14:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb44bef dev-java/eclipse-ecj: fix runtime error (slot 4.29) Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> ...-ecj-4.29.ebuild => eclipse-ecj-4.29-r1.ebuild} | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) 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 5fcf19d5c6d8..6ea7cb328bd8 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"