commit: 5e2230441f0c6fa0c6869032a4ace0e3b6f4ab31 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Jun 1 06:31:07 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Jun 2 06:20:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e223044
dev-java/ant-eclipse-ecj: drop 4.5.1, 4.22 Closes: https://bugs.gentoo.org/835390 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/ant-eclipse-ecj/Manifest | 1 - .../ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild | 53 ---------------------- .../ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild | 48 -------------------- dev-java/ant-eclipse-ecj/files/ecj-4.22 | 7 --- dev-java/ant-eclipse-ecj/files/ecj-4.5 | 7 --- 5 files changed, 116 deletions(-) diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest index e75203b23696..8445570a7ca7 100644 --- a/dev-java/ant-eclipse-ecj/Manifest +++ b/dev-java/ant-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/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild deleted file mode 100644 index 1fc9f8bb2347..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild +++ /dev/null @@ -1,53 +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 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-11:*" -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/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild deleted file mode 100644 index 8260b02e4de7..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 prefix - -DMF="R-${PV}-201509040015" - -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" -HOMEPAGE="http://www.eclipse.org/"; -SRC_URI="http://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.5" -IUSE="" - -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} - >=dev-java/ant-core-1.7" -RDEPEND="${CDEPEND} - >=virtual/jre-1.7" -DEPEND="${CDEPEND} - app-arch/unzip - >=virtual/jdk-1.7" - -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" - -java_prepare() { - # 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 b/dev-java/ant-eclipse-ecj/files/ecj-4.22 deleted file mode 100644 index 5bbcc318d9ba..000000000000 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.22 +++ /dev/null @@ -1,7 +0,0 @@ -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" diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.5 b/dev-java/ant-eclipse-ecj/files/ecj-4.5 deleted file mode 100644 index e0a0eb367f50..000000000000 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.5 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.5" -PACKAGE="=dev-java/ant-eclipse-ecj-4.5*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.5,ant-eclipse-ecj-4.5" -GENERATION="2"
