gentoo auto-resync : 12:10:2022 - 01:39:26

5 files changed, 66 insertions, 3 deletions

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 5ef2f9c06738..977ecde22ff4 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,7 +1,10 @@
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
-AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
+AUX ecj-4.22 378 BLAKE2B 778ccee76b754a47ac6aaaad293c836a0505ce2d761e5b18d2e83b3a6a7cc9c611a6b447f3fe973f6875253678799b165534eb9d6c5a68fed95efd25f4e41db5 SHA512 da5cdb2ebf8857dd04f5189b85a58a6738d8cee14490533d8b10b39489b293542571abe8b34fd7366300cffaa36ae4f942c0a7844db5a276560ab23044809978
+AUX ecj-4.25 384 BLAKE2B 8c1b7500a376c89c56bcff2954f06fd7595092e4eaa4f8dbe0f04a09cd2acb80199cee747b7b47617bbee1ec1ade69a2a0229d93e177d602eda2617a81bdb1eb SHA512 e799535ff08bbceb9be6034421fe10a8cc92f982641f89eedeba49887c512accb5729c8d1a2dcdb540ebe39041fc3857303192a350d286669154848f75b6e286
 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
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
-EBUILD ant-eclipse-ecj-4.22-r1.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
+EBUILD ant-eclipse-ecj-4.22-r2.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
+EBUILD ant-eclipse-ecj-4.25.ebuild 1424 BLAKE2B b54f3778c93a14b4db29b1a80eb12cf1f69eb139db4003aea7136083bf0bc9cdfe2f60914a4bd8924dedd0479b93940488d5206a7bafc744981a865c047804ca SHA512 e3eb3e24194a22baeda5fbf814a74b2408076672cc63da37c3b90960f90fcd832f59e9110565705c579c2e0cb31cd59fca634ef944ff8eda529c66a31714474f
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
index a2d55cda8ca1..a2d55cda8ca1 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
new file mode 100644
index 000000000000..0d981d39a2f3
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202208311800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.25"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 5bbcc318d9ba..57e76b76c539 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.22
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,5 +1,5 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.22*"
 SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
 SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.25 b/dev-java/ant-eclipse-ecj/files/ecj-4.25
new file mode 100644
index 000000000000..b1f3ece05dd7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.25
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
+GENERATION="2"