commit: 4a7a696720caaa09336a754e9c727863ccbd4d15 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Jun 1 06:29:35 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Jun 2 06:20:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7a6967
dev-java/eclipse-ecj: drop 4.5.1, 4.22 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/25715 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/eclipse-ecj/Manifest | 1 - dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild | 72 --------------------------- dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild | 68 ------------------------- 3 files changed, 141 deletions(-) diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index e75203b23696..8445570a7ca7 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,3 +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.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild deleted file mode 100644 index 12eec977d83f..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.22.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}-202111241800" - -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.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-11:* - 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.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild deleted file mode 100644 index 2aed82b6859b..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="ecj" -DMF="R-${PV}-201509040015" - -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.5" -IUSE="+ant" - -COMMON_DEP=" - app-eselect/eselect-java" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.7 - app-arch/unzip" -PDEPEND=" - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )" - -JAVA_JAR_FILENAME="${MY_PN}.jar" - -S="${WORKDIR}" - -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details -java_prepare() { - # 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 -}
