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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F733158090 for ; Mon, 30 May 2022 08:36:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F5B5E0986; Mon, 30 May 2022 08:36:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 34350E0986 for ; Mon, 30 May 2022 08:36:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4EC87341111 for ; Mon, 30 May 2022 08:36:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A93DC48C for ; Mon, 30 May 2022 08:36:09 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1653899764.ebf1a8c251eefb23889ac984b0b033e4957df894.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 X-VCS-Directories: dev-java/ant-eclipse-ecj/ dev-java/ant-eclipse-ecj/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: ebf1a8c251eefb23889ac984b0b033e4957df894 X-VCS-Branch: master Date: Mon, 30 May 2022 08:36:09 +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: 10ef5943-8b2c-403e-ad67-1ca36c488c08 X-Archives-Hash: c9eaa139d6070aa980c679286feaa877 commit: ebf1a8c251eefb23889ac984b0b033e4957df894 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun May 15 11:27:40 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon May 30 08:36:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf1a8c2 dev-java/ant-eclipse-ecj: virtual/jdk-11:*" -> -17:* Bug: https://bugs.gentoo.org/831559 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Florian Schmaus gentoo.org> .../ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild | 53 ++++++++++++++++++++++ dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 | 7 +++ 2 files changed, 60 insertions(+) diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild new file mode 100644 index 000000000000..786880f955b6 --- /dev/null +++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 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}-202111241800" + +DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" +HOMEPAGE="https://www.eclipse.org/" +SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" + +LICENSE="EPL-1.0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +SLOT="4.22" +IUSE="" + +CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} + dev-java/ant-core:0" +# though technically both could be set to 1.8 and it would +# compile using jdk 11+, it would not compile using jdk 1.8 +# because eclipse ecj has min jdk 11 +RDEPEND="${CDEPEND} + >=virtual/jre-11:*" +DEPEND="${CDEPEND} + >=virtual/jdk-17:*" +BDEPEND="app-arch/unzip" + +JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" + +src_prepare() { + default + + # Remove everything but the Ant component. + find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die + + rm build.xml || die +} + +src_compile() { + java-pkg-simple_src_compile + find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" +} + +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} +} diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 b/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 new file mode 100644 index 000000000000..5bbcc318d9ba --- /dev/null +++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 @@ -0,0 +1,7 @@ +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22" +PACKAGE="=dev-java/ant-eclipse-ecj-4.21*" +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" +SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17" +ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.22,ant-eclipse-ecj-4.22" +GENERATION="2"