Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
Date: Sun, 01 May 2022 16:34:16
Message-Id: 1651422850.6905ec7bf09a1dd2faf8bb83cca42b4a968fdf57.fordfrog@gentoo
1 commit: 6905ec7bf09a1dd2faf8bb83cca42b4a968fdf57
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Sun May 1 16:10:45 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 16:34:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6905ec7b
7
8 dev-java/ant-eclipse-ecj: drop 4.10-r1, 4.13
9
10 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
11 Closes: https://github.com/gentoo/gentoo/pull/25277
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 dev-java/ant-eclipse-ecj/Manifest | 2 -
15 .../ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild | 48 ---------------------
16 .../ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild | 50 ----------------------
17 dev-java/ant-eclipse-ecj/files/ecj-4.10 | 7 ---
18 dev-java/ant-eclipse-ecj/files/ecj-4.13 | 7 ---
19 5 files changed, 114 deletions(-)
20
21 diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
22 index 03ff7d5e8f22..e75203b23696 100644
23 --- a/dev-java/ant-eclipse-ecj/Manifest
24 +++ b/dev-java/ant-eclipse-ecj/Manifest
25 @@ -1,5 +1,3 @@
26 -DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
27 -DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
28 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
29 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
30 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
31
32 diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
33 deleted file mode 100644
34 index 720f27959e1a..000000000000
35 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
36 +++ /dev/null
37 @@ -1,48 +0,0 @@
38 -# Copyright 1999-2021 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=6
42 -
43 -JAVA_PKG_IUSE="doc source"
44 -
45 -inherit java-pkg-2 java-pkg-simple prefix
46 -
47 -DMF="R-${PV}-201812060815"
48 -
49 -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
50 -HOMEPAGE="http://www.eclipse.org/"
51 -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
52 -
53 -LICENSE="EPL-1.0"
54 -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
55 -SLOT="4.10"
56 -IUSE=""
57 -
58 -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
59 - >=dev-java/ant-core-1.7"
60 -RDEPEND="${CDEPEND}
61 - >=virtual/jre-11"
62 -DEPEND="${CDEPEND}
63 - app-arch/unzip
64 - >=virtual/jdk-11"
65 -
66 -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
67 -
68 -java_prepare() {
69 - # Remove everything but the Ant component.
70 - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
71 -
72 - rm build.xml || die
73 -}
74 -
75 -src_compile() {
76 - java-pkg-simple_src_compile
77 - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
78 -}
79 -
80 -src_install() {
81 - java-pkg-simple_src_install
82 - insinto /usr/share/java-config-2/compiler
83 - doins "${FILESDIR}/ecj-${SLOT}"
84 - eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
85 -}
86
87 diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
88 deleted file mode 100644
89 index a7881b3908e8..000000000000
90 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
91 +++ /dev/null
92 @@ -1,50 +0,0 @@
93 -# Copyright 1999-2021 Gentoo Authors
94 -# Distributed under the terms of the GNU General Public License v2
95 -
96 -EAPI=7
97 -
98 -JAVA_PKG_IUSE="doc source"
99 -
100 -inherit java-pkg-2 java-pkg-simple prefix
101 -
102 -DMF="R-${PV}-201909161045"
103 -
104 -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
105 -HOMEPAGE="http://www.eclipse.org/"
106 -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
107 -
108 -LICENSE="EPL-1.0"
109 -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
110 -SLOT="4.13"
111 -IUSE=""
112 -
113 -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
114 - dev-java/ant-core:0"
115 -RDEPEND="${CDEPEND}
116 - >=virtual/jre-11"
117 -DEPEND="${CDEPEND}
118 - app-arch/unzip
119 - >=virtual/jdk-11"
120 -
121 -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
122 -
123 -src_prepare() {
124 - default
125 -
126 - # Remove everything but the Ant component.
127 - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
128 -
129 - rm build.xml || die
130 -}
131 -
132 -src_compile() {
133 - java-pkg-simple_src_compile
134 - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
135 -}
136 -
137 -src_install() {
138 - java-pkg-simple_src_install
139 - insinto /usr/share/java-config-2/compiler
140 - doins "${FILESDIR}/ecj-${SLOT}"
141 - eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
142 -}
143
144 diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.10 b/dev-java/ant-eclipse-ecj/files/ecj-4.10
145 deleted file mode 100644
146 index cc87bb2fc4d6..000000000000
147 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.10
148 +++ /dev/null
149 @@ -1,7 +0,0 @@
150 -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.10"
151 -PACKAGE="=dev-java/ant-eclipse-ecj-4.10*"
152 -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
153 -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
154 -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
155 -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.10"
156 -GENERATION="2"
157
158 diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.13 b/dev-java/ant-eclipse-ecj/files/ecj-4.13
159 deleted file mode 100644
160 index d9c479e37367..000000000000
161 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.13
162 +++ /dev/null
163 @@ -1,7 +0,0 @@
164 -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.13"
165 -PACKAGE="=dev-java/ant-eclipse-ecj-4.13*"
166 -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
167 -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
168 -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
169 -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.13,ant-eclipse-ecj-4.13"
170 -GENERATION="2"