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 5657F15806E for ; Sun, 21 May 2023 07:58:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88B9AE07E1; Sun, 21 May 2023 07:58:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5F066E07E1 for ; Sun, 21 May 2023 07:58:05 +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 86FD8340CC7 for ; Sun, 21 May 2023 07:58:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E669FA67 for ; Sun, 21 May 2023 07:58:02 +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: <1684655805.859789d989078ab395572fe5738db3b21df2e07b.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/Manifest dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild X-VCS-Directories: dev-java/eclipse-ecj/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 859789d989078ab395572fe5738db3b21df2e07b X-VCS-Branch: master Date: Sun, 21 May 2023 07:58:02 +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: c3f3d38a-54cf-4f9e-94ab-1bb25bd92b17 X-Archives-Hash: 730c7510f969ffa2e06bb20483bf03b3 commit: 859789d989078ab395572fe5738db3b21df2e07b Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun May 21 07:49:58 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 21 07:56:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=859789d9 dev-java/eclipse-ecj: drop 4.22-r1, 4.25 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/eclipse-ecj/Manifest | 2 - dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild | 72 ------------------------- dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild | 72 ------------------------- 3 files changed, 146 deletions(-) diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index ca4978dfd113..aa67f4731d80 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,4 +1,2 @@ DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d -DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c -DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild deleted file mode 100644 index f869a2c5af31..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 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 - -MY_PN="ecj" -DMF="R-${PV}-202111241800" - -DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -SLOT="4.22" -IUSE="+ant" - -COMMON_DEP=" - app-eselect/eselect-java - dev-java/ant-core:0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - >=virtual/jdk-17:* - app-arch/unzip" -PDEPEND=" - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )" - -JAVA_JAR_FILENAME="${MY_PN}.jar" -JAVA_GENTOO_CLASSPATH="ant-core" - -S="${WORKDIR}" - -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details -src_prepare() { - default - - # These have their own package. - rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -r org/eclipse/jdt/internal/antadapter || die - - # JavaCore is not distributed in the jar - sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \ - -e 's|JavaCore.getOptions()||g' \ - org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java -} - -src_compile() { - java-pkg-simple_src_compile - find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${MY_PN}-${SLOT} --main \ - org.eclipse.jdt.internal.compiler.batch.Main -} - -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.25.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild deleted file mode 100644 index 25f270741274..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# 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 - -MY_PN="ecj" -DMF="R-${PV}-202208311800" - -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" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -SLOT="4.25" -IUSE="+ant" - -COMMON_DEP=" - app-eselect/eselect-java - dev-java/ant-core:0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - >=virtual/jdk-17:* - app-arch/unzip" -PDEPEND=" - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )" - -JAVA_JAR_FILENAME="${MY_PN}.jar" -JAVA_GENTOO_CLASSPATH="ant-core" - -S="${WORKDIR}" - -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details -src_prepare() { - default - - # These have their own package. - rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -r org/eclipse/jdt/internal/antadapter || die - - # JavaCore is not distributed in the jar - sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \ - -e 's|JavaCore.getOptions()||g' \ - org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java -} - -src_compile() { - java-pkg-simple_src_compile - find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${MY_PN}-${SLOT} --main \ - org.eclipse.jdt.internal.compiler.batch.Main -} - -pkg_postinst() { - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ecj-${SLOT} -} - -pkg_postrm() { - eselect ecj update -}