gentoo auto-resync : 24:01:2024 - 10:45:40

6 files changed, 153 insertions, 5 deletions

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 9512d017bf1b..c21d323955a0 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,8 +1,12 @@
+AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
+AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
 AUX ecj-4.30 402 BLAKE2B e95fd45bcd60440c8b11fc8f0e34eaf40674cd004939ffcaea392f3e899f9afaae7bf1dd21525099a93012338363a4a1450d69645aa9bb91153a41dc25985e6e SHA512 50623fe3dff25d0451e4dbb8e1ab14c7f5eb566adc999eeb1612b1d4e2672a5289f6a2383a40465884d26b702efc9cd7d099843c8ea4af5d23511dfa1cae5e67
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
+EBUILD eclipse-ecj-4.15-r1.ebuild 1459 BLAKE2B 790e4edc6c824ca2f05f7f784487392c3d2b5afedba50a0b1d29c52592ca40b07a2d429501a2b07b826c1ad16d6892dc58b9793f7c012c27502909a1caa3f8ef SHA512 0fde58f741c882e6064bfc655c696e1f72f16fb67c9345cf90f452710bff7d91c8685a87a00ab668550a9fd40a90cab9d4137089f7c7bb947d4fa93d2b2b4e93
 EBUILD eclipse-ecj-4.15.ebuild 1736 BLAKE2B c2bb6e3bf06c39d5633c9db215b9ff3047c83c6fb3377281e91e6eae40418e3a34154f7afa3c19edee5411ef08794fcb8fc84e1f2f9eb3c8d0e376bf69c99296 SHA512 b9db554f95148e810076ad3d86abd5f76a4a9942e33def4e31753847e59a7b682088456b7b20e9a1e7a4dc199a7687bd3ea8dfae4fdf691950a737ef2a4f31b6
+EBUILD eclipse-ecj-4.26-r1.ebuild 1458 BLAKE2B 389e4a4f0669d1cb03f9763bc8beb45efc353d767ac1d7b86c5a2e05f6ee71a1ed3b54e101e4332543c5f8f1dce48ed30a586e0b978107a2bb86b12042fdfa8d SHA512 b9d5d1e6baf6254de773a41c5ff559f3819809dac4317175301a9eb8c632fe4b83fe2537a0877a09f71015f605bc18cfa9e9dd4436f77dc20fc83e504c0610a5
 EBUILD eclipse-ecj-4.26.ebuild 1691 BLAKE2B 108efc14612f98445a7d8c16145fbb493e15ff39f79feef992ff46dd64a07354b181c6f385f0a6a1282ea5b23c96e65646ce1d326ef43e06e89d4d5ef6a22f09 SHA512 2ff8e9c4337d594e5ef72cdc97451330e42ea47e1df3e18d827adadad07407eed6e7e70fe9a3688e7b41faff966f5d6716c5705dafb9fbcb5c43ec41887b57f0
-EBUILD eclipse-ecj-4.30.ebuild 2294 BLAKE2B 75f70ec74e14b0c2be603da468965fe325bd1f6e7e3c3797f4a7ca3a5b64d99ec76ec0c9666b426e1464e5193a9b9e482af775161e4a8a305fa88d4437b2ed28 SHA512 12b047f67a3f5a2884a066e11684f319e55b6fda1da0e418c312c5dfa051b534cb88f08113a23e27791ea1f96e67e1f2eb64815415796a2b82b41d64f4500a6f
+EBUILD eclipse-ecj-4.30-r1.ebuild 2258 BLAKE2B 41ecb0bdf6ab8b3dd2539521561b7d9e9e4a660837bd5309a0c57409a03ccc7ba2c2a2648b92cb3d82c588a2ba092dde5d0e78ddb2fffdd969938bc2b13d7703 SHA512 807b63fcfcac8379f9605b2773f49778d6ee504f7950505bf45510eb1ca10b83f70bcccd5b893a87bbd5489b5fa7754b1a7f2995167709fc665d041b248112c5
 MISC metadata.xml 747 BLAKE2B 734d84847d4c2670a042e4636188d5c0e6f333a653933fa9365ae87477adc439a9a77362307b144c72077b68cfa6e9e8068989f021147ea9fa68a86a989f4c62 SHA512 22d6f55ee210dc62f7463692726b82b4ea30a67fe4debb6860fab53b227b7254874b8c3364add8ff9d9b62dc3e35b500b61faa7f999fa61460b2a94d56759cc0
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 000000000000..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/eclipse-ecj-4.26-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild
new file mode 100644
index 000000000000..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/eclipse-ecj-4.30.ebuild b/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"
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 000000000000..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"
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 000000000000..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"