commit: 0ebb3028a29ae18141cb5fcfb89705fead88648a Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Dec 2 16:15:20 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Dec 4 09:03:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebb3028
dev-java/eclipse-ecj: drop 4.27-r2, 4.29-r1 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/34093 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/eclipse-ecj/Manifest | 2 - dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild | 79 ------------------------ dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild | 81 ------------------------- dev-java/eclipse-ecj/files/ecj-4.27 | 7 --- dev-java/eclipse-ecj/files/ecj-4.29 | 7 --- 5 files changed, 176 deletions(-) diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index b5275b049bf0..b68a29378f06 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,5 +1,3 @@ DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f -DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b -DIST ecjsrc-4.29.jar 2319437 BLAKE2B 2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91 SHA512 d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild deleted file mode 100644 index c71988b8619d..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild +++ /dev/null @@ -1,79 +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" -# 3.33.0 according to -# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_27/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 -MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.33.0" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202303020300" - -DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/"; -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"; -S="${WORKDIR}" - -LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -SLOT="4.27" - -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} - dev-java/ant-core:0 - >=virtual/jdk-21:*" -RDEPEND="${COMMON_DEP} - >=virtual/jre-11:*" - -DOCS=( org/eclipse/jdt/core/README.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" -JAVA_CLASSPATH_EXTRA="ant-core" -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 -type f \ - ! -name '*.java' \ - | 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" -} - -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.29-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild deleted file mode 100644 index 0de20cf2511c..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild +++ /dev/null @@ -1,81 +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" -# 3.35.0 according to -# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_29/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 -MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.35.0" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202309031000" - -DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/"; -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"; -S="${WORKDIR}" - -LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -SLOT="4.29" - -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} - 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:*" - -DOCS=( org/eclipse/jdt/core/README.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" -JAVA_CLASSPATH_EXTRA="ant-core" -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 -type f \ - ! -name '*.java' \ - | 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" -} - -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/files/ecj-4.27 b/dev-java/eclipse-ecj/files/ecj-4.27 deleted file mode 100644 index 7b66f97ff0c7..000000000000 --- a/dev-java/eclipse-ecj/files/ecj-4.27 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.27" -PACKAGE="=dev-java/ant-eclipse-ecj-4.27*" -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 18 19 20 21" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27,ant-eclipse-ecj-4.27" -GENERATION="2" diff --git a/dev-java/eclipse-ecj/files/ecj-4.29 b/dev-java/eclipse-ecj/files/ecj-4.29 deleted file mode 100644 index 4cb14c005ddf..000000000000 --- a/dev-java/eclipse-ecj/files/ecj-4.29 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.29" -PACKAGE="=dev-java/ant-eclipse-ecj-4.29*" -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 18 19 20 21" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.29,ant-eclipse-ecj-4.29" -GENERATION="2"
