subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-java\/eclipse\-ecj\/"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-05-22 Thread Miroslav Šulc

commit: 611d56c357ce42c0192d3a999214a5740d045bb1
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 22 08:50:12 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 22 09:30:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611d56c3

dev-java/eclipse-ecj: restrict 4.27 to >=virtual/jdk-21:*

Closes: https://bugs.gentoo.org/931195
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36767
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{eclipse-ecj-4.27.ebuild => eclipse-ecj-4.27-r1.ebuild}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
similarity index 94%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
index 590dc3324bcb..5b3748f2682d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
@@ -17,14 +17,15 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 SLOT="4.27"
 
 BDEPEND="app-arch/unzip"
 COMMON_DEP="app-eselect/eselect-java"
+# jdk-21 for https://bugs.gentoo.org/931195
 DEPEND="${COMMON_DEP}
dev-java/ant:0
-   >=virtual/jdk-17:*"
+   >=virtual/jdk-21:*"
 RDEPEND="${COMMON_DEP}
>=virtual/jre-11:*"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-04-30 Thread Sam James

commit: bc5816e23b703adf36288b85ce91713c8b2325e4
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 15:30:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 15:30:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5816e2

dev-java/eclipse-ecj: Stabilize 4.20 amd64, #930961

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
index 9e78dd4ea2d0..c176a5638e8e 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 SLOT="4.20"
 
 BDEPEND="app-arch/unzip"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-04-30 Thread Sam James

commit: 20aa9364665b8afc9ed7769ae3710b971c33a920
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 15:30:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 15:30:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20aa9364

dev-java/eclipse-ecj: Stabilize 4.20 x86, #930961

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
index c176a5638e8e..b892008977f0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.20"
 
 BDEPEND="app-arch/unzip"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-04-05 Thread Miroslav Šulc

commit: 01764fa4e70a671251e07a298ecd075a00ded1c4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Apr  4 12:23:57 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr  5 08:10:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01764fa4

dev-java/eclipse-ecj: update HOMEPAGE

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
index a85b35c482a6..44e5c0c826be 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV/_rc/RC}-202402290520"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/;
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 S="${WORKDIR}"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2024-04-03 Thread Miroslav Šulc

commit: 61c75f13b5657b9bb83a565f09e02d26e4033095
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Mar 11 18:22:28 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr  3 08:42:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c75f13

dev-java/eclipse-ecj: add 4.27

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/35320/commits/fc0849bc41aa1588c6269d6ab3c17d13ea9c190e
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild | 67 
 dev-java/eclipse-ecj/files/ecj-4.27  |  7 +++
 3 files changed, 75 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 4da4516ce4b0..3f8812e6ada6 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,5 +1,6 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
 SHA512 
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.20.jar 2255761 BLAKE2B 
42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2
 SHA512 
fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
 SHA512 
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
+DIST ecjsrc-4.27.jar 2301849 BLAKE2B 
77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95
 SHA512 
689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 
7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d29bd376bf158b114e30a17d40
 SHA512 
ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
 DIST ecjsrc-4.31.jar 2347993 BLAKE2B 
edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45
 SHA512 
3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
new file mode 100644
index ..9404efd320c9
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.36.0 according to
+# 
https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/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/_rc/RC}-202303020300"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="4.27"
+
+BDEPEND="app-arch/unzip"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+   dev-java/ant:0
+   >=virtual/jdk-17:*"
+RDEPEND="${COMMON_DEP}
+   >=virtual/jre-11:*"
+
+HTML_DOCS=( about.html )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+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
+
+   # Exception in thread "main" java.lang.SecurityException: Invalid 
signature file digest for Manifest main attributes
+   rm META-INF/ECLIPSE_* || die
+   mkdir "${JAVA_RESOURCE_DIRS}" || die
+   find -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-04-03 Thread Miroslav Šulc

commit: 0f7d68dc8c9bf8fa0f560579b9cc12ef94c0e66c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr  2 08:50:51 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr  3 08:43:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7d68dc

dev-java/eclipse-ecj: update HOMEPAGE

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/35320/commits/49feeb6dfb68f5e855afeda2af8cc6c712eb1b45
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild | 2 +-
 dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild| 2 +-
 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild | 2 +-
 dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild| 2 +-
 dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index a1e33e84d946..63723662da43 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV}-202003050155"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/;
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
 S="${WORKDIR}"
 

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
index 81da64f7b218..9e78dd4ea2d0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV/_rc/RC}-202106111600"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/;
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 
 LICENSE="EPL-1.0"

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index 2cde3036d250..0a750385f6ab 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV}-202211231800"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/;
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
 S="${WORKDIR}"
 

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
index 9404efd320c9..590dc3324bcb 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV/_rc/RC}-202303020300"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/;
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 
 LICENSE="EPL-1.0"

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index 2799f8635f43..b87cee1c3b1a 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV/_rc/RC}-202312010110"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/;
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt;
 
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
 S="${WORKDIR}"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-30 Thread Arthur Zamarin

commit: a4d7315e7c4c2803e0aab69829f41c643d327fc0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 30 11:13:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 30 11:13:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d7315e

dev-java/eclipse-ecj: Keyword 4.30-r1 ppc64, #928124

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index 1d3e39f22bfc..2799f8635f43 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 SLOT="4.30"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-30 Thread Arthur Zamarin

commit: abb2944afdf5bfcf208909adadd9155a645b0f3c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 30 08:50:43 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 30 08:50:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb2944a

dev-java/eclipse-ecj: Keyword 4.30-r1 x86, #928124

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index 8198793a6a85..1d3e39f22bfc 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="4.30"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/, dev-java/eclipse-ecj/files/

2024-03-29 Thread Miroslav Šulc

commit: 4d7bd2153de16ff8e8c5b0750f413b86a9b3dc4a
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Mar  6 13:17:31 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 29 13:57:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7bd215

dev-java/eclipse-ecj: add 4.31

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

 dev-java/eclipse-ecj/Manifest  |  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild   | 75 ++
 dev-java/eclipse-ecj/files/ecj-4.31|  7 ++
 .../files/eclipse-ecj-4.31-java21.patch| 12 
 4 files changed, 95 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 81bfdcd45d4d..4da4516ce4b0 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,3 +2,4 @@ DIST ecjsrc-4.15.jar 2166228 BLAKE2B 
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b
 DIST ecjsrc-4.20.jar 2255761 BLAKE2B 
42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2
 SHA512 
fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
 SHA512 
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 
7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d29bd376bf158b114e30a17d40
 SHA512 
ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
+DIST ecjsrc-4.31.jar 2347993 BLAKE2B 
edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45
 SHA512 
3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
new file mode 100644
index ..a85b35c482a6
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.36.0 according to
+# 
https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.37.0"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV/_rc/RC}-202402290520"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+SLOT="4.31"
+
+BDEPEND="app-arch/unzip"
+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-1.10.14: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 )
+PATCHES=( "${FILESDIR}/eclipse-ecj-4.31-java21.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+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() {
+   default #780585
+   java-pkg-2_src_prepare
+
+   # Exception in thread "main" java.lang.SecurityException: Invalid 
signature file digest for Manifest main attributes
+   rm META-INF/ECLIPSE_* || die
+
+   mkdir "${JAVA_RESOURCE_DIRS}" || die
+   find -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+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.31 
b/dev-java/eclipse-ecj/files/ecj-4.31
new file mode 100644
index ..245976d4ed6d
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/

2024-03-29 Thread Miroslav Šulc

commit: a9670d41c7d9966978d056549255280f2a409ad8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Mar 29 13:57:28 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 29 13:57:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9670d41

dev-java/eclipse-ecj: added support for java 22 to 4.31

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

 dev-java/eclipse-ecj/files/ecj-4.31 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/eclipse-ecj/files/ecj-4.31 
b/dev-java/eclipse-ecj/files/ecj-4.31
index 245976d4ed6d..b5ed4e32a326 100644
--- a/dev-java/eclipse-ecj/files/ecj-4.31
+++ b/dev-java/eclipse-ecj/files/ecj-4.31
@@ -1,7 +1,7 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.31"
 PACKAGE="=dev-java/eclipse-ecj-4.31*"
-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"
+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 22"
+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 22"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
 ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.31"
 GENERATION="2"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2024-03-17 Thread Miroslav Šulc

commit: bea60df687a652c8494f38b68e6c2c8a916a77fa
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Mar  7 12:19:16 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Mar 17 08:56:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea60df6

dev-java/eclipse-ecj: add 4.20

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/35320/commits/223938a7b936e9ce3ab98d5cb0df0864b21abc30
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild | 64 
 dev-java/eclipse-ecj/files/ecj-4.20  |  7 +++
 3 files changed, 72 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index b68a29378f06..81bfdcd45d4d 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
 SHA512 
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
+DIST ecjsrc-4.20.jar 2255761 BLAKE2B 
42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2
 SHA512 
fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
 SHA512 
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 
7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d29bd376bf158b114e30a17d40
 SHA512 
ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
new file mode 100644
index ..81da64f7b218
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 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/_rc/RC}-202106111600"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="4.20"
+
+BDEPEND="app-arch/unzip"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+   dev-java/ant:0
+   >=virtual/jdk-11:*"
+RDEPEND="${COMMON_DEP}
+   >=virtual/jre-1.8:*"
+
+HTML_DOCS=( about.html )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+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
+
+   # Exception in thread "main" java.lang.SecurityException: Invalid 
signature file digest for Manifest main attributes
+   rm META-INF/ECLIPSE_* || die
+   mkdir "${JAVA_RESOURCE_DIRS}" || die
+   find -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+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.20 
b/dev-java/eclipse-ecj/files/ecj-4.20
new file mode 100644
index ..c6ecf2c0deeb
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.20
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.20"
+PACKAGE="=dev-java/eclipse-ecj-4.20*"
+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"
+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"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.20"
+GENERATION="2"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-17 Thread Miroslav Šulc

commit: 2398befde3fa0625afbfa1db918041c4f4604a21
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Mar 15 15:56:53 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Mar 17 08:56:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2398befd

dev-java/eclipse-ecj: remove unused USE flag from metadata.xml

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/35320/commits/3528e576b3a65cd631240358f1b342c2725f7f15
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-java/eclipse-ecj/metadata.xml 
b/dev-java/eclipse-ecj/metadata.xml
index 218c1eb894a3..d59675e7a795 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -15,7 +15,4 @@ used with Ant by using the -lib option to and and setting
 
eclipse-jdt/eclipse.jdt.core
 
-
-   Support using ecj in Ant builds via 
dev-java/ant-eclipse-ecj
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-12 Thread Miroslav Šulc

commit: 171790738742b72cee986d537291f795f0fbcf07
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Mar 12 08:21:37 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar 12 09:33:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17179073

dev-java/eclipse-ecj: drop 4.15, 4.26

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild | 74 
 dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild | 72 ---
 2 files changed, 146 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
deleted file mode 100644
index fbd6934fc695..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_PN="ecj"
-DMF="R-${PV}-202003050155"
-
-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 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.15"
-IUSE="+ant"
-
-COMMON_DEP="
-   app-eselect/eselect-java
-   dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-   virtual/jre"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-11
-   app-arch/unzip"
-PDEPEND="
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-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.26.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
deleted file mode 100644
index 4ad6e3222bb1..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ /dev/null
@@ -1,72 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-202211231800"
-
-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 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.26"
-IUSE="+ant"
-
-COMMON_DEP="
-   app-eselect/eselect-java
-   dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-11:*"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-17:*
-   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() {
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-12 Thread Sam James

commit: 21b8dcfa4718e02f8479ccdcf9d9c6337c937baa
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 12 08:05:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 12 08:05:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b8dcfa

dev-java/eclipse-ecj: Stabilize 4.26-r2 x86, #925546

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index d8bef250aefc..2cde3036d250 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.26"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-12 Thread Sam James

commit: 82a9e40445831971ce5563d8c91983f0166e750c
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 12 08:05:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 12 08:05:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a9e404

dev-java/eclipse-ecj: Stabilize 4.15-r1 x86, #925546

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index 36f278a4dca6..a1e33e84d946 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.15"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-11 Thread Ionen Wolkens

commit: 5dcc3348cd9a6ae305da2a527980f134c44138e6
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Mar 12 00:10:12 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 04:11:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dcc3348

dev-java/eclipse-ecj: Keyword 4.15-r1 ppc64, #924297

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index 6f1440c1f82f..d278c2621636 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 SLOT="4.15"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-11 Thread Ionen Wolkens

commit: 6c0e656df869147bb13ed8de687ea3c62e6dffb8
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Mar 12 00:10:12 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 04:11:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0e656d

dev-java/eclipse-ecj: Keyword 4.26-r2 ppc64, #924297

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index 8843146e1f91..d2be4b7f4d9d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 SLOT="4.26"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-11 Thread Ionen Wolkens

commit: 112f8df6fdae61617a43257ed275ef622447bb5f
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Mar 12 00:44:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 04:11:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112f8df6

dev-java/eclipse-ecj: Keyword 4.15-r1 x86, #924297

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index d278c2621636..36f278a4dca6 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 SLOT="4.15"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-03-11 Thread Ionen Wolkens

commit: eac5da68aa78e6da07334c2c7d8918cc00a04c13
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Mar 12 00:44:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 04:11:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac5da68

dev-java/eclipse-ecj: Keyword 4.26-r2 x86, #924297

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index d2be4b7f4d9d..d8bef250aefc 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 SLOT="4.26"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-02-26 Thread Miroslav Šulc

commit: 1c8aa61ca1ffdf3f5306e886d09e98e54798
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Feb 26 11:27:40 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Feb 26 12:52:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8a

dev-java/eclipse-ecj: remove .RSA and .SF files from META-INF

Closes: https://bugs.gentoo.org/925083
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35538
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{eclipse-ecj-4.26-r1.ebuild => eclipse-ecj-4.26-r2.ebuild}| 8 
 1 file changed, 8 insertions(+)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
similarity index 81%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index ed2724a7e5d4..8843146e1f91 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -46,6 +46,14 @@ src_prepare() {
| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
 }
 
+src_compile() {
+   java-pkg-simple_src_compile
+   #925083
+   # 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

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-02-26 Thread Jakov Smolić

commit: ec641799506a83166a503efcdd5ea746c824937a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Feb 26 10:46:40 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Feb 26 10:46:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec641799

dev-java/eclipse-ecj: Stabilize 4.26-r1 amd64, #925525

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
index 6a8632e9feb6..ed2724a7e5d4 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 SLOT="4.26"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-02-26 Thread Jakov Smolić

commit: a06c14b590bc1ff0f9b7374cb04e389242958b90
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Feb 26 10:46:39 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Feb 26 10:46:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06c14b5

dev-java/eclipse-ecj: Stabilize 4.15-r1 amd64, #925525

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index 753425431bb8..6f1440c1f82f 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 SLOT="4.15"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/, dev-java/eclipse-ecj/files/

2024-01-24 Thread Miroslav Šulc

commit: 39457f36be261ce89d4d765bfd13357452cb0ee6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Jan 23 21:24:03 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 24 09:03:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39457f36

dev-java/eclipse-ecj: add 4.15-r1 for >=dev-java/ant-1.10.14

Includes ant-eclipse-ecj

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

 dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild | 65 +
 dev-java/eclipse-ecj/files/ecj-4.15 |  7 +++
 2 files changed, 72 insertions(+)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
new file mode 100644
index ..753425431bb8
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 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}-202003050155"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm ~arm64"
+SLOT="4.15"
+
+BDEPEND="
+   app-arch/unzip
+   app-arch/zip
+"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+   >=dev-java/ant-1.10.14:0
+   >=virtual/jdk-11:*"
+RDEPEND="${COMMON_DEP}
+   !dev-java/ant-eclipse-ecj:4.15
+   >=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+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 org META-INF -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+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.15 
b/dev-java/eclipse-ecj/files/ecj-4.15
new file mode 100644
index ..f943dedcc19b
--- /dev/null
+++ b/dev-java/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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2024-01-24 Thread Miroslav Šulc

commit: af2eaa975169bae6f210265840deed550f7d65f5
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Jan 23 20:41:45 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 24 09:03:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2eaa97

dev-java/eclipse-ecj: add 4.26-r1 for >=dev-java/ant-1.10.14

Includes ant-eclipse-ecj

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild | 65 +
 dev-java/eclipse-ecj/files/ecj-4.26 |  7 +++
 2 files changed, 72 insertions(+)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
new file mode 100644
index ..6a8632e9feb6
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 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}-202211231800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm ~arm64"
+SLOT="4.26"
+
+BDEPEND="
+   app-arch/unzip
+   app-arch/zip
+"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+   >=dev-java/ant-1.10.14:0
+   >=virtual/jdk-17:*"
+RDEPEND="${COMMON_DEP}
+   !dev-java/ant-eclipse-ecj:4.26
+   >=virtual/jre-11:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+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 org META-INF -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+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.26 
b/dev-java/eclipse-ecj/files/ecj-4.26
new file mode 100644
index ..950088453264
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.26
@@ -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 
19"
+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"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26"
+GENERATION="2"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2024-01-24 Thread Miroslav Šulc

commit: 7ccd417e1c5fc19ce8012757a588bbcb5c14f9d0
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Jan 23 19:43:27 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 24 09:03:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccd417e

dev-java/eclipse-ecj: 4.30-r1 for >=dev-java/ant-1.10.14

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{eclipse-ecj-4.30.ebuild => eclipse-ecj-4.30-r1.ebuild}   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
similarity index 93%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index 4dcc76c35f8f..8198793a6a85 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ 
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 SLOT="4.30"
 
 BDEPEND="
@@ -29,7 +29,7 @@ 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
+   >=dev-java/ant-1.10.14:0
>=virtual/jdk-21:*"
 # Parser.java:1095: error:
 # pattern matching in instanceof is not supported in -source 11
@@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEP}
 DOCS=( org/eclipse/jdt/core/README.md )
 
 JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
-JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_CLASSPATH_EXTRA="ant"
 JAVA_JAR_FILENAME="ecj.jar"
 JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
 JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2023-12-04 Thread Miroslav Šulc

commit: b11f9097eac4b3058c24002a8bbff980698360d7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Nov 24 16:31:28 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  4 09:03:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11f9097

dev-java/eclipse-ecj: add 4.30

SLOT="4.26" according to "Compatibility 100%" from japi-compliance-checker

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild | 81 
 dev-java/eclipse-ecj/files/ecj-4.30  |  7 +++
 3 files changed, 89 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 3166accfca73..b5275b049bf0 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,3 +2,4 @@ DIST ecjsrc-4.15.jar 2166228 BLAKE2B 
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b
 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 
7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d29bd376bf158b114e30a17d40
 SHA512 
ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
new file mode 100644
index ..9021253ff43c
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.36.0 according to
+# 
https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.36.0"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV/_rc/RC}-202312010110"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar;
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.26"
+
+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

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2023-12-04 Thread Miroslav Šulc

commit: 0ebb3028a29ae18141cb5fcfb89705fead88648a
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Dec  2 16:15:20 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  4 09:03:20 2023 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34093
Signed-off-by: Miroslav Šulc  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 
7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d29bd376bf158b114e30a17d40
 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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-12-04 Thread Miroslav Šulc

commit: 5299b3d2cb5bec50c492408ecea05038a5f16c5a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec  4 09:09:43 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  4 09:09:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5299b3d2

fixed slot in 4.30

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

 dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
index 9021253ff43c..4dcc76c35f8f 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.26"
+SLOT="4.30"
 
 BDEPEND="
app-arch/unzip

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2023-11-24 Thread Miroslav Šulc

commit: 96ebbfec0561965f28ae3be7c2e89c997dc19767
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Nov 24 12:15:00 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 24 12:52:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ebbfec

dev-java/eclipse-ecj: (slot 4.27) merge ant-eclipse-ecj

Applies same logic as from slot 4.29

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...j-4.27-r1.ebuild => eclipse-ecj-4.27-r2.ebuild} | 36 +-
 dev-java/eclipse-ecj/files/ecj-4.27|  7 +
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
similarity index 59%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
index 0c8b3763125d..c71988b8619d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
@@ -4,25 +4,27 @@
 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
+inherit java-pkg-2 java-pkg-simple prefix
 
-MY_PN="ecj"
 DMF="R-${PV}-202303020300"
 
 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;
+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"
-IUSE="+ant"
 
 BDEPEND="
app-arch/unzip
-   app-arch/zip"
+   app-arch/zip
+"
 COMMON_DEP="app-eselect/eselect-java"
 # ElementsImpl9.java:206: error:
 # method does not override or implement a method from a supertype
@@ -31,26 +33,21 @@ DEPEND="${COMMON_DEP}
>=virtual/jdk-21:*"
 RDEPEND="${COMMON_DEP}
>=virtual/jre-11:*"
-PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
 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="${MY_PN}.jar"
-JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
 JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
 JAVA_RESOURCE_DIRS="res"
 
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
 src_prepare() {
java-pkg-2_src_prepare
 
-   # These have their own package.
-   rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -r org/eclipse/jdt/internal/antadapter || die
-
mkdir "${JAVA_RESOURCE_DIRS}" || die
-   find org META-INF -type f \
+   find -type f \
! -name '*.java' \
| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
 }
@@ -58,7 +55,16 @@ src_prepare() {
 src_compile() {
java-pkg-simple_src_compile
# Error: A JNI error has occurred, please check your installation and 
try again
-   zip -d ecj.jar "META-INF/MANIFEST.MF" || die "Failed to remove 
MANIFEST.MF"
+   # 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() {

diff --git a/dev-java/eclipse-ecj/files/ecj-4.27 
b/dev-java/eclipse-ecj/files/ecj-4.27
new file mode 100644
index ..7b66f97ff0c7
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.27
@@ -0,0 +1,7 @@
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-11-24 Thread Miroslav Šulc

commit: 5cb44befdbb68373f131889e6d6bf287330c66c7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Nov 20 12:28:05 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 24 11:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb44bef

dev-java/eclipse-ecj: fix runtime error (slot 4.29)

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-ecj-4.29.ebuild => eclipse-ecj-4.29-r1.ebuild} | 27 +++---
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
similarity index 69%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
index 5fcf19d5c6d8..6ea7cb328bd8 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
@@ -20,22 +20,25 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="4.29"
 IUSE="+ant"
 
-COMMON_DEP="
-   app-eselect/eselect-java
-   dev-java/ant-core:0"
+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}
-   >=virtual/jdk-21:*
-   app-arch/unzip"
+   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:*"
-PDEPEND="
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
-JAVA_GENTOO_CLASSPATH="ant-core"
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_CLASSPATH_EXTRA="ant-core"
 JAVA_JAR_FILENAME="${MY_PN}.jar"
 JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
 JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
@@ -55,6 +58,14 @@ src_prepare() {
| 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"
+}
+
 pkg_postinst() {
einfo "To select between slots of ECJ..."
einfo " # eselect ecj"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-11-24 Thread Miroslav Šulc

commit: 3ff9b62d2089b461d1f920c37689e01d88a7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Nov 20 11:03:17 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 24 11:14:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff9b62d

dev-java/eclipse-ecj: fix runtime error (slot 4.27)

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-ecj-4.27.ebuild => eclipse-ecj-4.27-r1.ebuild} | 26 ++
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
similarity index 73%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
index fb56b1b9116c..0c8b3763125d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
@@ -20,20 +20,22 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="4.27"
 IUSE="+ant"
 
-COMMON_DEP="
-   app-eselect/eselect-java
-   dev-java/ant-core:0"
+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}
-   >=virtual/jdk-21:*
-   app-arch/unzip"
+   dev-java/ant-core:0
+   >=virtual/jdk-21:*"
 RDEPEND="${COMMON_DEP}
>=virtual/jre-11:*"
-PDEPEND="
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
-JAVA_GENTOO_CLASSPATH="ant-core"
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_CLASSPATH_EXTRA="ant-core"
 JAVA_JAR_FILENAME="${MY_PN}.jar"
 JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
 JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
@@ -48,11 +50,17 @@ src_prepare() {
rm -r org/eclipse/jdt/internal/antadapter || die
 
mkdir "${JAVA_RESOURCE_DIRS}" || die
-   find -type f \
+   find org META-INF -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
+   zip -d ecj.jar "META-INF/MANIFEST.MF" || die "Failed to remove 
MANIFEST.MF"
+}
+
 pkg_postinst() {
einfo "To select between slots of ECJ..."
einfo " # eselect ecj"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/files/, dev-java/eclipse-ecj/

2023-11-24 Thread Miroslav Šulc

commit: 3f1b41f2d7103c1381bca7d36e8b60c9c9f73bfc
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Nov 20 16:37:48 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 24 11:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1b41f2

dev-java/eclipse-ecj: merge ant-eclipse-ecj

Upstream builds both in the same jar file, see
https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/#JDTCORE

Removes reference to https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134
Adds MAVEN_ID
Adds Automatic-module-name

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild | 27 ++---
 dev-java/eclipse-ecj/files/ecj-4.29 |  7 +++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
index 6ea7cb328bd8..0de20cf2511c 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
@@ -4,21 +4,22 @@
 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
+inherit java-pkg-2 java-pkg-simple prefix
 
-MY_PN="ecj"
 DMF="R-${PV}-202309031000"
 
 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;
+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"
-IUSE="+ant"
 
 BDEPEND="
app-arch/unzip
@@ -34,24 +35,19 @@ DEPEND="${COMMON_DEP}
 # pattern matching in instanceof is not supported in -source 11
 RDEPEND="${COMMON_DEP}
>=virtual/jre-17:*"
-PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
 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="${MY_PN}.jar"
-JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
 JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
 JAVA_RESOURCE_DIRS="res"
 
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
 src_prepare() {
java-pkg-2_src_prepare
 
-   # These have their own package.
-   rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -r org/eclipse/jdt/internal/antadapter || die
-
mkdir "${JAVA_RESOURCE_DIRS}" || die
find -type f \
! -name '*.java' \
@@ -66,6 +62,13 @@ src_compile() {
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"

diff --git a/dev-java/eclipse-ecj/files/ecj-4.29 
b/dev-java/eclipse-ecj/files/ecj-4.29
new file mode 100644
index ..4cb14c005ddf
--- /dev/null
+++ b/dev-java/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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-11-19 Thread Miroslav Šulc

commit: aa3e36f877dedf5a7a83a0be50b8056aab1401fc
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Oct 25 07:54:37 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov 20 07:40:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3e36f8

dev-java/eclipse-ecj: update SRC_URI

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
index 7e0b3e719dec..4ad6e3222bb1 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -12,7 +12,7 @@ DMF="R-${PV}-202211231800"
 
 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;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
 
 LICENSE="EPL-1.0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-11-19 Thread Miroslav Šulc

commit: 327a50be14cd6d64dd6de36ede71397d54844e4b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Nov 18 19:21:33 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov 20 07:40:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327a50be

dev-java/eclipse-ecj: add 4.29

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index b59cc023f485..3166accfca73 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/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/eclipse-ecj/eclipse-ecj-4.29.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
new file mode 100644
index ..5fcf19d5c6d8
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.29.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+MY_PN="ecj"
+DMF="R-${PV}-202309031000"
+
+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;
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.29"
+IUSE="+ant"
+
+COMMON_DEP="
+   app-eselect/eselect-java
+   dev-java/ant-core:0"
+# ElementsImpl9.java:206: error:
+# method does not override or implement a method from a supertype
+DEPEND="${COMMON_DEP}
+   >=virtual/jdk-21:*
+   app-arch/unzip"
+# Parser.java:1095: error:
+# pattern matching in instanceof is not supported in -source 11
+RDEPEND="${COMMON_DEP}
+   >=virtual/jre-17:*"
+PDEPEND="
+   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+   java-pkg-2_src_prepare
+
+   # These have their own package.
+   rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+   rm -r org/eclipse/jdt/internal/antadapter || die
+
+   mkdir "${JAVA_RESOURCE_DIRS}" || die
+   find -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+pkg_postinst() {
+   einfo "To select between slots of ECJ..."
+   einfo " # eselect ecj"
+
+   eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+   eselect ecj update
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-11-19 Thread Miroslav Šulc

commit: 60d3749617bf87d016c2fd5d99320478d8b462f6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 17 07:22:12 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov 20 07:40:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d37496

dev-java/eclipse-ecj: add 4.27

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index aa67f4731d80..b59cc023f485 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,2 +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

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
new file mode 100644
index ..fb56b1b9116c
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
@@ -0,0 +1,65 @@
+# 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
+
+MY_PN="ecj"
+DMF="R-${PV}-202303020300"
+
+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;
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.27"
+IUSE="+ant"
+
+COMMON_DEP="
+   app-eselect/eselect-java
+   dev-java/ant-core:0"
+# ElementsImpl9.java:206: error:
+# method does not override or implement a method from a supertype
+DEPEND="${COMMON_DEP}
+   >=virtual/jdk-21:*
+   app-arch/unzip"
+RDEPEND="${COMMON_DEP}
+   >=virtual/jre-11:*"
+PDEPEND="
+   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_LAUNCHER_FILENAME="${MY_PN}-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+   java-pkg-2_src_prepare
+
+   # These have their own package.
+   rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+   rm -r org/eclipse/jdt/internal/antadapter || die
+
+   mkdir "${JAVA_RESOURCE_DIRS}" || die
+   find -type f \
+   ! -name '*.java' \
+   | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+pkg_postinst() {
+   einfo "To select between slots of ECJ..."
+   einfo " # eselect ecj"
+
+   eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+   eselect ecj update
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-07-18 Thread Sam James

commit: 62517d7c240dbf47e0dde03099ef1a3f36690c3d
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 18 17:20:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 17:20:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62517d7c

dev-java/eclipse-ecj: Keyword 4.15 arm, #906822

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index b5d08a9d60da..fbd6934fc695 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="4.15"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-07-18 Thread Sam James

commit: 2ce9c35930488a3581f57d5c970ecc6d9f4bd4d1
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 18 17:20:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 17:20:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce9c359

dev-java/eclipse-ecj: Keyword 4.26 arm, #906822

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
index 9423e27988e0..7e0b3e719dec 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="4.26"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-05-21 Thread Miroslav Šulc

commit: 859789d989078ab395572fe5738db3b21df2e07b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun May 21 07:49:58 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May 21 07:56:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=859789d9

dev-java/eclipse-ecj: drop 4.22-r1, 4.25

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest   |  2 -
 dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild | 72 -
 dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild| 72 -
 3 files changed, 146 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ca4978dfd113..aa67f4731d80 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/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/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
deleted file mode 100644
index f869a2c5af31..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
+++ /dev/null
@@ -1,72 +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"
-
-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://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.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-17:*
-   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.25.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
deleted file mode 100644
index 25f270741274..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.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}-202208311800"
-
-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

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-05-17 Thread Miroslav Šulc

commit: 01f4cb5f25578a019a76b0768fc094edd67b53d7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 17 07:27:52 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 18 05:59:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f4cb5f

dev-java/eclipse-ecj: update SRC_URI

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index c98b01d949da..f869a2c5af31 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ 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;
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-05-17 Thread Miroslav Šulc

commit: a327fea7811c6dd72054c75314e09e17d22b69cb
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 17 12:11:38 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 18 05:59:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a327fea7

dev-java/eclipse-ecj: add github upstream metadata

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

 dev-java/eclipse-ecj/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-java/eclipse-ecj/metadata.xml 
b/dev-java/eclipse-ecj/metadata.xml
index de58dba6e94e..218c1eb894a3 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -12,6 +12,9 @@ as a batch-compiler by running the ecj-3.x script, or it can 
be
 used with Ant by using the -lib option to and and setting
 -Dbuild.compiler=ecj
 
+
+   eclipse-jdt/eclipse.jdt.core
+
 
Support using ecj in Ant builds via 
dev-java/ant-eclipse-ecj

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-02-15 Thread Sam James

commit: d4ad125e2fe14966fd448b3e8e295485cbe3afb1
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 16 06:03:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 06:03:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ad125e

dev-java/eclipse-ecj: Stabilize 4.26 amd64, #894528

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
index 6f304725f7b1..9db35c0f173d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.26"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-02-15 Thread Sam James

commit: 4fdb4f267de56dd55aa5215fd0e04d218f49d524
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 16 06:03:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 06:03:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdb4f26

dev-java/eclipse-ecj: Stabilize 4.26 x86, #894528

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
index d4a38077e777..6f304725f7b1 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.26"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2023-01-15 Thread Miroslav Šulc

commit: bcaf43b5bd09555450674ef454b6ec7451c59ef9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jan 15 09:41:52 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jan 15 09:50:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcaf43b5

dev-java/eclipse-ecj: bump to 4.26

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

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild | 72 
 2 files changed, 73 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 00234773ac65..ca4978dfd113 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
 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/eclipse-ecj/eclipse-ecj-4.26.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
new file mode 100644
index ..d4a38077e777
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -0,0 +1,72 @@
+# 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
+
+MY_PN="ecj"
+DMF="R-${PV}-202211231800"
+
+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.26"
+IUSE="+ant"
+
+COMMON_DEP="
+   app-eselect/eselect-java
+   dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+   >=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+   >=virtual/jdk-17:*
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-11-11 Thread Sam James

commit: 850a53cec4c4f8fc2dcc84f59e9f5db73d3fc7cc
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 12 02:39:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 12 02:39:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850a53ce

dev-java/eclipse-ecj: Stabilize 4.25 amd64, #880871

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
index e10697904fa0..25f270741274 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.25"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-11-11 Thread Sam James

commit: d5f26d68b180251943956d4596b880eb5d58d13c
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 11 21:16:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 11 21:16:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f26d68

dev-java/eclipse-ecj: Stabilize 4.25 x86, #880871

Signed-off-by: Sam James  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
index 6cbe1264075f..e10697904fa0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.25"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-10-11 Thread Miroslav Šulc

commit: 7409b42202526a1ee88d920a980565ae49e14249
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Oct 11 18:24:29 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Oct 11 18:25:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7409b422

dev-java/eclipse-ecj: bump to 4.25

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

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild | 72 
 2 files changed, 73 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 8445570a7ca7..00234773ac65 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/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/eclipse-ecj/eclipse-ecj-4.25.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
new file mode 100644
index ..6cbe1264075f
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@@ -0,0 +1,72 @@
+# 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}-202208311800"
+
+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.25"
+IUSE="+ant"
+
+COMMON_DEP="
+   app-eselect/eselect-java
+   dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+   >=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+   >=virtual/jdk-17:*
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-07-05 Thread Agostino Sarubbo

commit: 938f78154a2f5f211b76ccc2c0d2cae49c7a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  5 07:28:48 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  5 07:28:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938f7815

dev-java/eclipse-ecj: x86 stable wrt bug #856427

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index 193fab0f8b2c..c98b01d949da 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.22"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-07-05 Thread Agostino Sarubbo

commit: 596c5ddf6c1e280ce37793764acaaeee7ef07ec0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  5 06:00:58 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  5 06:00:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596c5ddf

dev-java/eclipse-ecj: amd64 stable wrt bug #856427

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index 82bd5d06ebf2..193fab0f8b2c 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.22"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-06-02 Thread Miroslav Šulc

commit: 4a7a696720caaa09336a754e9c727863ccbd4d15
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun  1 06:29:35 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun  2 06:20:25 2022 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25715
Signed-off-by: Miroslav Šulc  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..
--- 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..
--- 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? (

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-05-30 Thread Florian Schmaus

commit: 7b2992fd44c5df1a80931e28cb8c1faa7ed2bb89
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun May 15 11:33:58 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon May 30 08:36:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2992fd

dev-java/eclipse-ecj: virtual/jdk-11:*" -> -17:*

Bug: https://bugs.gentoo.org/831559
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25501
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild | 72 +
 1 file changed, 72 insertions(+)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
new file mode 100644
index ..82bd5d06ebf2
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-17:*
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-05-11 Thread Florian Schmaus

commit: 2f18129fe76d63433204b63035d89a6b33c4ceba
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 11 06:42:56 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed May 11 07:33:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f18129f

dev-java/eclipse-ecj: update HOMEPAGE, SRC_URI

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
index e9f4bee64891..12eec977d83f 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
@@ -11,8 +11,8 @@ MY_PN="ecj"
 DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-05-10 Thread Florian Schmaus

commit: db757eb75c7e8a58418d356789ab4c14129cc45b
Author: Madhu Priya Murugan  rohde-schwarz  com>
AuthorDate: Tue May 10 08:30:19 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue May 10 13:32:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db757eb7

dev-java/eclipse-ecj: SRC_URI

The versions 4.15 and 4.5.1 are moved to archive and so the SRC_URI
has changed. This pull request fixes the URIs.

Signed-off-by: Madhu Priya Murugan  rohde-schwarz.com>
Closes: https://github.com/gentoo/gentoo/pull/25416
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild  | 4 ++--
 dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index 37b49f67ee47..56b7b7bfeed2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -11,8 +11,8 @@ MY_PN="ecj"
 DMF="R-${PV}-202003050155"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
+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"

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index 5e2a7d0f72aa..2aed82b6859b 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -11,8 +11,8 @@ MY_PN="ecj"
 DMF="R-${PV}-201509040015"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-05-01 Thread Miroslav Šulc

commit: 7a48153abe45e7553228d8b74806c391f626c8d3
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun May  1 16:09:15 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May  1 16:34:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a48153a

dev-java/eclipse-ecj: drop 4.10, 4.13-r2

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest   |  2 -
 dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild| 70 ---
 dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild | 74 -
 3 files changed, 146 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 03ff7d5e8f22..e75203b23696 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,5 +1,3 @@
-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.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.10.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
deleted file mode 100644
index 18842971b055..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-201812060815"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://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.10"
-IUSE="+ant"
-
-COMMON_DEP="
-   app-eselect/eselect-java
-   dev-java/ant-core"
-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
-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
-}

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
deleted file mode 100644
index 11d2edd08bd6..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-03-30 Thread Jakov Smolić

commit: eaa22af24f4f3ae5be9a87f77e86bb884cc56530
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 30 11:08:44 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 30 11:08:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa22af2

dev-java/eclipse-ecj: Stabilize 4.15 x86, #835417

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index 8e6af419fbc2..37b49f67ee47 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/;
 
SRC_URI="http://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"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.15"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-03-02 Thread Miroslav Šulc

commit: 53e70bdc80b31b4a9a610b212c31c044dc28ca52
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Mar  2 20:29:15 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Mar  2 20:52:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e70bdc

dev-java/eclipse-ecj: bump to 4.22

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild | 72 
 2 files changed, 73 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 73b44b992ff9..92d1bdc98603 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,4 +2,5 @@ DIST ecjsrc-4.10.jar 2036945 BLAKE2B 
cf9e50e53dac970a0b6b1231024a4efdc9adc92e025
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B 
d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1
 SHA512 
f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
 SHA512 
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.21.jar 2264087 BLAKE2B 
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
 SHA512 
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
+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
new file mode 100644
index ..e9f4bee64891
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
@@ -0,0 +1,72 @@
+# 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="http://www.eclipse.org/;
+SRC_URI="http://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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-03-02 Thread Miroslav Šulc

commit: 9cbe4afc3eb5a456ef5f424eb0a4146bebcb4965
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Mar  2 20:44:26 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Mar  2 20:52:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbe4afc

dev-java/eclipse-ecj: dropped 4.21

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 -
 dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild | 76 
 2 files changed, 77 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 92d1bdc98603..03ff7d5e8f22 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,6 +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.21.jar 2264087 BLAKE2B 
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
 SHA512 
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
 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.21.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild
deleted file mode 100644
index 918e7574efde..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 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
-
-MY_PN="ecj"
-DMF="R-${PV}-202109060500"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://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=$(ver_cut 1-2)
-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:*
-"
-PDEPEND="
-   app-arch/unzip
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-02-19 Thread Miroslav Šulc

commit: 225d40d89719b41c85c27b2d50658d432fc5c087
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Feb 18 21:29:53 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb 19 09:44:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225d40d8

dev-java/eclipse-ecj: Drop 4.4.2-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24262
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 -
 dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild | 62 
 2 files changed, 63 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index c7a2c4f75045..73b44b992ff9 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,5 +2,4 @@ DIST ecjsrc-4.10.jar 2036945 BLAKE2B 
cf9e50e53dac970a0b6b1231024a4efdc9adc92e025
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B 
d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1
 SHA512 
f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
 SHA512 
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.21.jar 2264087 BLAKE2B 
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
 SHA512 
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
-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/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
deleted file mode 100644
index ea7d04f5d41a..
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,62 +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}-201502041700"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://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.4"
-IUSE="+ant"
-
-COMMON_DEP="
-   app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.6
-   app-arch/unzip"
-PDEPEND="
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-
-java_prepare() {
-   # These have their own package.
-   rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -r org/eclipse/jdt/internal/antadapter || die
-
-   rm build.xml || die
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2022-02-02 Thread Jakov Smolić

commit: fa7596cd5072dc32aab1ce562dd565883bb52ce9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Feb  2 15:23:27 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Feb  2 15:23:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7596cd

dev-java/eclipse-ecj: Stabilize 4.15 amd64, #831117

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index 0ddd9051340a..8e6af419fbc2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/;
 
SRC_URI="http://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"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.15"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2021-11-17 Thread Miroslav Šulc

commit: fa424c611aed302fb1120404331f77fc9a48257d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Nov 17 12:06:14 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Nov 17 12:06:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa424c61

dev-java/eclipse-ecj: bump to 4.21

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild | 76 
 2 files changed, 77 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ed26372e0153..c7a2c4f75045 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,5 +1,6 @@
 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.21.jar 2264087 BLAKE2B 
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
 SHA512 
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
 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/eclipse-ecj/eclipse-ecj-4.21.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild
new file mode 100644
index ..918e7574efde
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 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
+
+MY_PN="ecj"
+DMF="R-${PV}-202109060500"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/;
+SRC_URI="http://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=$(ver_cut 1-2)
+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:*
+"
+PDEPEND="
+   app-arch/unzip
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2020-11-24 Thread Miroslav Šulc

commit: b9e7c1e9dc967b8d1e05973d2dd0f6529a6eb9c3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Nov 24 10:27:50 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Nov 24 10:30:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e7c1e9

dev-java/eclipse-ecj: bump to 4.15

can't bump to the latest as it needs jdk > 11

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

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild | 74 
 2 files changed, 75 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 7e64b32d88d..ed26372e015 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/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/eclipse-ecj/eclipse-ecj-4.15.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
new file mode 100644
index 000..0ddd9051340
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -0,0 +1,74 @@
+# 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
+
+MY_PN="ecj"
+DMF="R-${PV}-202003050155"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/;
+SRC_URI="http://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.15"
+IUSE="+ant"
+
+COMMON_DEP="
+   app-eselect/eselect-java
+   dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+   virtual/jre"
+DEPEND="${COMMON_DEP}
+   >=virtual/jdk-11
+   app-arch/unzip"
+PDEPEND="
+   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2020-09-19 Thread Aaron Bauman

commit: 31ee40eea4a57d7623ab0bbdf4431bf009675cac
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Sep 19 15:54:00 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Sep 19 15:55:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ee40ee

dev-java/eclipse-ecj: drop old EAPI=4

Closes: https://bugs.gentoo.org/736569
Closes: https://bugs.gentoo.org/740992
Signed-off-by: Aaron Bauman  gentoo.org>

 dev-java/eclipse-ecj/Manifest |  1 -
 dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild | 97 ---
 2 files changed, 98 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 0eecdf15578..7e64b32d88d 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,5 +1,4 @@
 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/eclipse-ecj/eclipse-ecj-4.2.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
deleted file mode 100644
index ed2ff2427af..000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-201209141800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://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.2"
-IUSE="+ant userland_GNU"
-
-COMMON_DEP="
-   app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.6
-   app-arch/unzip
-   userland_GNU? ( sys-apps/findutils )"
-PDEPEND="
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-S="${WORKDIR}"
-
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-java_prepare() {
-   # These have their own package.
-   rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -fr org/eclipse/jdt/internal/antadapter || die
-}
-
-src_compile() {
-   local javac_opts javac java jar
-
-   javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
-   javac="$(java-config -c)"
-   java="$(java-config -J)"
-   jar="$(java-config -j)"
-
-   find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
-   -path org/eclipse/jdt/internal/compiler/tool -prune -o -name 
'*.java' \
-   -print > sources-1.4
-   find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > 
sources-1.6
-
-   mkdir -p bootstrap || die
-   cp -pPR org META-INF bootstrap || die
-   cd "${S}/bootstrap" || die
-
-   einfo "bootstrapping ${MY_PN} with ${javac} ..."
-   ${javac} ${javac_opts} @../sources-1.4 || die
-   ${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 
|| die
-
-   find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name 
'*.rsc' -o -name '*.inf' -o -name '*.props' \) \
-   -exec ${jar} cf ${MY_PN}.jar {} + || die
-
-   cd "${S}" || die
-   einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-   ${java} -classpath bootstrap/${MY_PN}.jar \
-   org.eclipse.jdt.internal.compiler.batch.Main \
-   ${javac_opts} -nowarn @sources-1.4 || die
-   ${java} -classpath bootstrap/${MY_PN}.jar \
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2020-02-27 Thread Miroslav Šulc

commit: 5256a96cc588bbbf074a7990dbd80dda1d064861
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Feb 27 22:28:45 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb 27 22:35:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5256a96c

dev-java/eclipse-ecj: fixed jre dependency in 4.13

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{eclipse-ecj-4.13-r1.ebuild => eclipse-ecj-4.13-r2.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.13-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
similarity index 98%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.13-r1.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
index 2915e307740..11d2edd08bd 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.13-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
@@ -23,7 +23,7 @@ COMMON_DEP="
app-eselect/eselect-java
dev-java/ant-core:0"
 RDEPEND="${COMMON_DEP}
-   >=virtual/jre-8"
+   virtual/jre"
 DEPEND="${COMMON_DEP}
>=virtual/jdk-11
app-arch/unzip"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2020-02-27 Thread Miroslav Šulc

commit: 63570d22f9d4b231889e8977a787f2dc815896d8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Feb 27 20:00:30 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb 27 20:01:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63570d22

dev-java/eclipse.ecj: 4.13 changed to have source/target 1.8

it still needs jdk 11 to compile but the source and target used
is 1.8 now so it can be used even with packages that still need
to compile using jdk 1.8

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{eclipse-ecj-4.13.ebuild => eclipse-ecj-4.13-r1.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r1.ebuild
similarity index 93%
rename from dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-4.13-r1.ebuild
index 395198f56fe..2915e307740 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,13 +23,15 @@ COMMON_DEP="
app-eselect/eselect-java
dev-java/ant-core:0"
 RDEPEND="${COMMON_DEP}
-   >=virtual/jre-11"
+   >=virtual/jre-8"
 DEPEND="${COMMON_DEP}
>=virtual/jdk-11
app-arch/unzip"
 PDEPEND="
ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
 JAVA_JAR_FILENAME="${MY_PN}.jar"
 JAVA_GENTOO_CLASSPATH="ant-core"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2019-10-16 Thread Miroslav Šulc

commit: 40b993f1d148164f27e6d411808ef18f7a6b2d54
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 16 10:38:34 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 16 10:50:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b993f1

dev-java/eclipse-ecj-4.13: bump

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

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild | 72 
 2 files changed, 73 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index f9913c9ea68..0eecdf15578 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/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/eclipse-ecj/eclipse-ecj-4.13.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild
new file mode 100644
index 000..395198f56fe
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild
@@ -0,0 +1,72 @@
+# 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
+
+MY_PN="ecj"
+DMF="R-${PV}-201909161045"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/;
+SRC_URI="http://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.13"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2019-01-23 Thread Miroslav Šulc

commit: 0c8bed7ac026e9fe6fa3a2629098ae30a8bfc7a7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jan 23 14:49:29 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 23 14:54:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8bed7a

dev-java/eclipse-ecj-4.10: bump

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/eclipse-ecj/Manifest|  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild | 70 
 2 files changed, 71 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 87d12d3fa15..f9913c9ea68 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
+DIST ecjsrc-4.10.jar 2036945 BLAKE2B 
cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092
 SHA512 
e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 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/eclipse-ecj/eclipse-ecj-4.10.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
new file mode 100644
index 000..18842971b05
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-201812060815"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/;
+SRC_URI="http://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.10"
+IUSE="+ant"
+
+COMMON_DEP="
+   app-eselect/eselect-java
+   dev-java/ant-core"
+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
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2016-12-13 Thread Agostino Sarubbo

commit: 66bb2df59b537736d9687ccd845f543f72b1b33b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 13 11:29:56 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 13 11:29:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66bb2df5

dev-java/eclipse-ecj: x86 stable wrt bug #598324

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index 3e858a3..326464b 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.eclipse.org/;
 
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris"
 SLOT="4.5"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2016-12-13 Thread Agostino Sarubbo

commit: 8f26e7fae1c1757b0f0ab69488ec15c36f9ac525
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 13 11:04:18 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 13 11:04:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f26e7fa

dev-java/eclipse-ecj: amd64 stable wrt bug #598324

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index 0781309..3e858a3 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.eclipse.org/;
 
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris"
 SLOT="4.5"
 IUSE="+ant"

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2016-02-19 Thread James Le Cuirot

commit: 0045cb181c631be9fe51d037942d6afdfafb
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Feb 19 20:51:28 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Feb 19 20:54:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0045

dev-java/eclipse-ecj: Remove 3.7

It doesn't build with Java 8 and we're last-riting its revdep,
tomcat-6. Should tomcat-6 return, it can point to a later
version. Upstream uses 4.3.

Package-Manager: portage-2.2.27

 dev-java/eclipse-ecj/Manifest|   1 -
 dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild | 101 ---
 2 files changed, 102 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 6255e04..f91eafb 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
-DIST ecjsrc-3.7.2.jar 1366333 SHA256 
755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 
53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32
 WHIRLPOOL 
399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 
d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 
967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 WHIRLPOOL 
3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 
ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 
53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 WHIRLPOOL 
5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
 DIST ecjsrc-4.5.1.jar 1809543 SHA256 
101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 WHIRLPOOL 
739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
deleted file mode 100644
index 3d6a3fc..000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-201202080800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris"
-SLOT="3.7"
-IUSE="+ant userland_GNU"
-
-COMMON_DEP="
-   app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-   || ( virtual/jdk:1.7 virtual/jdk:1.6 )
-   app-arch/unzip
-   userland_GNU? ( sys-apps/findutils )"
-PDEPEND="
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-S="${WORKDIR}"
-
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-java_prepare() {
-   # These have their own package.
-   rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -fr org/eclipse/jdt/internal/antadapter || die
-
-   # upstream build.xml excludes this
-   rm META-INF/eclipse.inf
-}
-
-src_compile() {
-   local javac_opts javac java jar
-
-   javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
-   javac="$(java-config -c)"
-   java="$(java-config -J)"
-   jar="$(java-config -j)"
-
-   find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
-   -path org/eclipse/jdt/internal/compiler/tool -prune -o -name 
'*.java' \
-   -print > sources-1.4
-   find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > 
sources-1.6
-
-   mkdir -p bootstrap || die
-   cp -pPR org bootstrap || die
-   cd "${S}/bootstrap" || die
-
-   einfo "bootstrapping ${MY_PN} with ${javac} ..."
-   ${javac} ${javac_opts} @../sources-1.4 || die
-   ${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 
|| die
-
-   find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' 
\) \
-   -exec ${jar} cf ${MY_PN}.jar {} + || die
-
-   cd "${S}" || die
-   einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-   ${java} -classpath bootstrap/${MY_PN}.jar \
-   org.eclipse.jdt.internal.compiler.batch.Main \
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2015-12-04 Thread Miroslav Šulc

commit: feafc7e321c93ffdd4f4b7fdfeb3f6a54fdef306
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec  4 17:52:20 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  4 17:56:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feafc7e3

dev-java/eclipse-ecj: version bump - new slot 4.5

Package-Manager: portage-2.2.26

 dev-java/eclipse-ecj/Manifest |  1 +
 dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild | 69 +++
 2 files changed, 70 insertions(+)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 875bb75..6255e04 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
 DIST ecjsrc-3.7.2.jar 1366333 SHA256 
755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 
53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32
 WHIRLPOOL 
399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 
d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 
967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 WHIRLPOOL 
3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 
ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 
53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 WHIRLPOOL 
5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
+DIST ecjsrc-4.5.1.jar 1809543 SHA256 
101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 WHIRLPOOL 
739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
new file mode 100644
index 000..a690ae1
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://www.eclipse.org/;
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2015-08-22 Thread James Le Cuirot

commit: 43edaba3df2cd3ae5a1cbda1743726aed41cb17e
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:55:36 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:58:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43edaba3

dev-java/eclipse-ecj: Remove old

Package-Manager: portage-2.2.20.1

 dev-java/eclipse-ecj/Manifest |  1 -
 dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild | 71 ---
 2 files changed, 72 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 952214b..875bb75 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
 DIST ecjsrc-3.7.2.jar 1366333 SHA256 
755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 
53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32
 WHIRLPOOL 
399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 
d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 
967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 WHIRLPOOL 
3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
-DIST ecjsrc-4.4.1.jar 1759152 SHA256 
ba3a471d000ae983498a0f398955e2f09d8c1093880c9f37544d47e5460ff82a SHA512 
27086c4c6d35a07f38e2c5ae3d34314fcdfe8b03fd1bbd3e652acd10195a0ec4a20b312f4cc0d0e8204b824eb230d1730a2aef9d886896b81f26b93eff1ae2d1
 WHIRLPOOL 
1b1da40f61ea5b3768e48dd7b9685b9405e35f3b5019acaeae937335f521819743cb7bacd5a7603ea72a20fe1310c6e28fb57d6c64e46b2035b70335029b2937
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 
ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 
53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 WHIRLPOOL 
5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
deleted file mode 100644
index 8594099..000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE=doc source
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN=ecj
-DMF=R-${PV}-201409250400
-
-DESCRIPTION=Eclipse Compiler for Java
-HOMEPAGE=http://www.eclipse.org/;
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
-
-LICENSE=EPL-1.0
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris
-SLOT=4.4
-IUSE=+ant userland_GNU
-
-COMMON_DEP=
-   app-eselect/eselect-java
-RDEPEND=${COMMON_DEP}
-   =virtual/jre-1.6
-DEPEND=${COMMON_DEP}
-   =virtual/jdk-1.6
-   app-arch/unzip
-   userland_GNU? ( sys-apps/findutils )
-PDEPEND=
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )
-
-S=${WORKDIR}
-
-JAVA_PKG_WANT_SOURCE=1.6
-JAVA_PKG_WANT_TARGET=1.6
-
-java_prepare() {
-   # These have their own package.
-   rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -fr org/eclipse/jdt/internal/antadapter || die
-
-   rm build.xml || die
-}
-
-src_compile() {
-   java-pkg-simple_src_compile
-   find -name *.properties -or -name *.rsc -or -name *.props \
--or -wholename */META-INF/* | xargs jar uvf ${S}/${PN}.jar 
|| 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
-
-   java-pkg_newjar ${PN}.jar ${MY_PN}.jar
-}
-
-pkg_postinst() {
-   einfo To select between slots of ECJ...
-   einfo  # eselect ecj
-
-   eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-   eselect ecj update
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2015-08-22 Thread James Le Cuirot

commit: 3e459c24777fe6bcdb6d2803aa30343e9a22a17e
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:52:19 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:58:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e459c24

dev-java/eclipse-ecj: Mark 4.4.2-r1 stable using ALLARCHES policy

Package-Manager: portage-2.2.20.1

 dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
index 1e6a3e8..5eed548 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE=http://www.eclipse.org/;
 
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
 
 LICENSE=EPL-1.0
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux 
~x86-linux ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris
 SLOT=4.4
 IUSE=+ant

71 matches

Mail list logo