From b3b92de25c3fc5f6bddc5e513027140591a0b2a5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 23 May 2024 00:06:40 +0100 Subject: gentoo auto-resync : 23:05:2024 - 00:06:39 --- dev-java/Manifest.gz | Bin 55182 -> 55178 bytes dev-java/eclipse-ecj/Manifest | 2 +- dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild | 68 ++++++++++++++++++++++++ dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild | 67 ----------------------- 4 files changed, 69 insertions(+), 68 deletions(-) create mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild delete mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 1998f784d439..8bb85191c99f 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index a67cfa81deee..22a807331eef 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -14,7 +14,7 @@ DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0 EBUILD eclipse-ecj-4.15-r1.ebuild 1494 BLAKE2B 8c7d98c6ceb4dca4c9a15a51f7b2ac78f4c017413e6b7adbb5902e36124eca2279f8e84f01b0b2a1c3c0443f4cfa395860301698f399b2bba3e3d518688bf45d SHA512 6f4cdf61faaeb8ff2ec9e99ec81fc4076c1515439b3cc4a9d769e32f7416ab78b6dca7ecc65b55ad9fcef53f4f187bc3c0173d0cd1c050dedf4975b6b7980dca EBUILD eclipse-ecj-4.20.ebuild 1595 BLAKE2B 4a50fc15445c4f181bfeddff056bc4bb98c6b5283e0708e67acad46d1a73b1490cc77aeaa69f12703383c08ef04a7fba6a97da10961cc3674c5205aba5b9501f SHA512 78f1fbe161290048f71c19df3b0a941e12215cb7c23a31f773af0d9b6a876efd23cf8138793a108fe515bdc3b70b22227e7d3f59c7c9eb3da23a7f2073b27722 EBUILD eclipse-ecj-4.26-r2.ebuild 1824 BLAKE2B dea06a3376512b90d00b46241d110a0853b5e31f37bea1c149b5ad08478f8b63ea0c6d028c8abe8d2120a19d673747c63ee3bcc0313155fa28d5c8a9fc179174 SHA512 10ee16cda0c1e202fcec23b0c547725c3a357afb0e95e6b0030d7430b2ae1836287b438b203906f4014b478492763700fba5bc9250ae791e44b1d74ffc98ec97 -EBUILD eclipse-ecj-4.27.ebuild 1797 BLAKE2B 638d3b533efe91d1c6f958700311a0263c8961165d6bc31e8a7dcb31bac1b7e94507a5c065dbb8950bbd99ce716006ffedd2a9e919cbdd5d8baa0a9b71f5553e SHA512 9e6a881f3441beb72ad36a11078269bead4f2137d2dcc6fae12866be68fe4939e269eceede7fac9486289fd73e92d68056fc23323733e40179c80c1b660eab34 +EBUILD eclipse-ecj-4.27-r1.ebuild 1836 BLAKE2B d94d7a885cfe64ddb4b3f43d22b5cda07a1f05e5e6036752f258d555d20ec844c59b7b9190d011d3ec8c0d9b69d18ad9e950432f9ad938fb6161d26ae048beb3 SHA512 8974f5c5ddb45a11060a83d48416bd0483bca7e11020adb93ae17ebee7c80075610ed53dc0b48d013af9c3f322cb107e3e763a37a0020be671eedf289a7a0333 EBUILD eclipse-ecj-4.30-r1.ebuild 2295 BLAKE2B 26738da8b2cc0989169bf6f21a3b367dde4c41423b6f08de7b6d759f3c02817ef5f4ec4b6db74c6ab44fd6a04ef0db00e405a3693ae454ac83e0b0056a22f77e SHA512 4b7312e2eecc59d058071744d71a99acd67d696ff417f86d92b2640ed9f91a70e9b42c381d0c16a20e273e401a96181223ee624584a7164c5339984bd063d831 EBUILD eclipse-ecj-4.31.ebuild 2097 BLAKE2B 4e09212d61b2da9479d148bc8eaeccf8479d5f42884366599b4c5d3c107f437a804f8377ff9fe5cb63d9caa63fc3ffda366f7350bffcf982ea0dc079b00a357b SHA512 c37f91ea971d4805b70e60c69707968bdb05b6eeec2f146526aa6eed7f4fae428554cd02894bace8d087f327fd707164e7b77bfb165ca5cff10b80a8fe97f6d4 MISC metadata.xml 637 BLAKE2B fd8214d9377a8a4101b3fd5041e17fbed9c6f5ffc8586b328db92120fc780c16d4b1152d4137a2e5554f77f60e9fe24ea3d133fc3469a4e78da7e84244bcb951 SHA512 0a0f6d8bcac2bef3a74e6328a65ecab490fcd437e8107fd1087d17ca158da29d1044d9e06d05e2781e97df88e6aec30db185c97bb9b2bdbd9b257332ce0232e0 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild new file mode 100644 index 000000000000..5b3748f2682d --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild @@ -0,0 +1,68 @@ +# 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://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 ~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-21:*" +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 +} diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild deleted file mode 100644 index 590dc3324bcb..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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://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" -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 -} -- cgit v1.2.3