public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2019-10-16 10:51 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2019-10-16 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d80a72bfd49cf949b17211b82e85413852e22a56
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 10:37:24 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 10:50:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80a72bf

dev-java/ant-eclipse-ecj-4.13: bump

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/ant-eclipse-ecj/Manifest                  |  1 +
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild    | 50 ++++++++++++++++++++++
 dev-java/ant-eclipse-ecj/files/ecj-4.13            |  7 +++
 3 files changed, 58 insertions(+)

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index f9913c9ea68..0eecdf15578 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,4 +1,5 @@
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
+DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553

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
new file mode 100644
index 00000000000..de1022b748c
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-201909161045"
+
+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.13"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-11"
+
+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 "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}

diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.13 b/dev-java/ant-eclipse-ecj/files/ecj-4.13
new file mode 100644
index 00000000000..08d3a4aaa9c
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.13
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.13"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.13*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.13"
+GENERATION="2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2019-10-16 10:51 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2019-10-16 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3788a0c0065e09e281ab3e5f369dece8309d7d8a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 10:44:02 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 10:50:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3788a0c0

dev-java/ant-eclipse-ecj-4.10-r1: fixed compiler supported versions

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{ant-eclipse-ecj-4.10.ebuild => ant-eclipse-ecj-4.10-r1.ebuild}   | 0
 dev-java/ant-eclipse-ecj/files/ecj-4.10                               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
similarity index 100%
rename from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild
rename to dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild

diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.10 b/dev-java/ant-eclipse-ecj/files/ecj-4.10
index cdb25989770..cc87bb2fc4d 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.10
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.10
@@ -1,7 +1,7 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.10"
 PACKAGE="=dev-java/ant-eclipse-ecj-4.10*"
-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"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
 ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.10"
 GENERATION="2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2020-11-24 10:30 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-11-24 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     5970177a7d79ad3192129f7244d3a3a26d4366d0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 10:28:53 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 10:30:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5970177a

dev-java/ant-eclipse-ecj: bump to 4.15

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/ant-eclipse-ecj/Manifest                  |  1 +
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild    | 50 ++++++++++++++++++++++
 dev-java/ant-eclipse-ecj/files/ecj-4.13            |  2 +-
 dev-java/ant-eclipse-ecj/files/ecj-4.15            |  7 +++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 7e64b32d88d..ed26372e015 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,4 +1,5 @@
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
+DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
new file mode 100644
index 00000000000..27aab2586f9
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202003050155"
+
+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.15"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-11"
+
+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 "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}

diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.13 b/dev-java/ant-eclipse-ecj/files/ecj-4.13
index 08d3a4aaa9c..d9c479e3736 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.13
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.13
@@ -3,5 +3,5 @@ PACKAGE="=dev-java/ant-eclipse-ecj-4.13*"
 SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
 SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.13"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.13,ant-eclipse-ecj-4.13"
 GENERATION="2"

diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.15 b/dev-java/ant-eclipse-ecj/files/ecj-4.15
new file mode 100644
index 00000000000..f943dedcc19
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.15
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.15*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15"
+GENERATION="2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2022-06-02  6:20 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2022-06-02  6:20 UTC (permalink / raw
  To: gentoo-commits

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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2022-10-11 18:25 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2022-10-11 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9fb1c83e22a53f4a2e7d6cf55166ee6152d2f0c3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 18:22:47 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 18:25:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb1c83e

dev-java/ant-eclipse-ecj: bump to 4.25

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/ant-eclipse-ecj/Manifest                  |  1 +
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild    | 53 ++++++++++++++++++++++
 dev-java/ant-eclipse-ecj/files/ecj-4.25            |  7 +++
 3 files changed, 61 insertions(+)

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 8445570a7ca7..00234773ac65 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
new file mode 100644
index 000000000000..0d981d39a2f3
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -0,0 +1,53 @@
+# 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}-202208311800"
+
+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.25"
+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-17:*"
+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/files/ecj-4.25 b/dev-java/ant-eclipse-ecj/files/ecj-4.25
new file mode 100644
index 000000000000..b1f3ece05dd7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.25
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+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"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
+GENERATION="2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2022-10-11 18:25 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2022-10-11 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     041050f4566d75669767b7bd18f7d8572bf39b37
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 18:24:08 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 18:25:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041050f4

dev-java/ant-eclipse-ecj: forcing reinstall of fixed ecj-4.22 file

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{ant-eclipse-ecj-4.22-r1.ebuild => ant-eclipse-ecj-4.22-r2.ebuild}  | 0
 dev-java/ant-eclipse-ecj/files/ecj-4.22                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
similarity index 100%
rename from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
rename to dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild

diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 5bbcc318d9ba..57e76b76c539 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.22
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,5 +1,5 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.22*"
 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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2023-05-21  7:58 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2023-05-21  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     f3dd1c0fd0113fe0af9b0b16227e746facb17384
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 21 07:49:07 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 21 07:56:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dd1c0f

dev-java/ant-eclipse-ecj: drop 4.22-r2, 4.25

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                  |  2 -
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild | 53 ----------------------
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild    | 53 ----------------------
 dev-java/ant-eclipse-ecj/files/ecj-4.22            |  7 ---
 dev-java/ant-eclipse-ecj/files/ecj-4.25            |  7 ---
 5 files changed, 122 deletions(-)

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index ca4978dfd113..aa67f4731d80 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-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/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
deleted file mode 100644
index a2d55cda8ca1..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.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-17:*"
-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.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
deleted file mode 100644
index 22c9edfdafa4..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.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}-202208311800"
-
-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.25"
-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-17:*"
-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/files/ecj-4.22 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
deleted file mode 100644
index 57e76b76c539..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.22*"
-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.25 b/dev-java/ant-eclipse-ecj/files/ecj-4.25
deleted file mode 100644
index b1f3ece05dd7..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.25
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
-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"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
-GENERATION="2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
@ 2023-11-20  7:54 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2023-11-20  7:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d586bf56034bbdfe249733eb90413edb99fb0406
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Nov 18 20:16:34 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 07:40:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d586bf56

dev-java/ant-eclipse-ecj: add 4.29

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33894
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/ant-eclipse-ecj/Manifest                  |  1 +
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild    | 51 ++++++++++++++++++++++
 dev-java/ant-eclipse-ecj/files/ecj-4.29            |  7 +++
 3 files changed, 59 insertions(+)

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index b59cc023f485..3166accfca73 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
new file mode 100644
index 000000000000..15e5b9477ade
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
@@ -0,0 +1,51 @@
+# 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 prefix
+
+DMF="R-${PV}-202309031000"
+
+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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.29"
+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-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || 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.29 b/dev-java/ant-eclipse-ecj/files/ecj-4.29
new file mode 100644
index 000000000000..4cb14c005ddf
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.29
@@ -0,0 +1,7 @@
+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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-11-20  7:54 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20  7:54 [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2023-05-21  7:58 Miroslav Šulc
2022-10-11 18:25 Miroslav Šulc
2022-10-11 18:25 Miroslav Šulc
2022-06-02  6:20 Miroslav Šulc
2020-11-24 10:30 Miroslav Šulc
2019-10-16 10:51 Miroslav Šulc
2019-10-16 10:51 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox