From fab95e98818bada1626a7723a1348f4e920d25e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Feb 2024 17:40:44 +0000 Subject: gentoo auto-resync : 26:02:2024 - 17:40:44 --- dev-java/Manifest.gz | Bin 59144 -> 59138 bytes dev-java/eclipse-ecj/Manifest | 2 +- dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild | 65 --------------------- dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild | 73 ++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 66 deletions(-) delete mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild create mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index e608176d1368..8d7364680bce 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 0961cfa0041d..23d6c3fc5dbe 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -6,7 +6,7 @@ DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d46 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23 EBUILD eclipse-ecj-4.15-r1.ebuild 1458 BLAKE2B c74100192c7de31cd9c3d476ac1868b04d08e50e80b32b64204ae1644f02309e4eb0990732c7f25c66a757056e786d39c46d67246f2226aa91006b975bd18a46 SHA512 484f057ec6821e9afb7270cc2fafaa022020790a70ddea4a4198263a7b9732fc54b5127ebbcac65af49f712a7484c616bfacc792bbcd9bc0bab9eaf238dae401 EBUILD eclipse-ecj-4.15.ebuild 1736 BLAKE2B c2bb6e3bf06c39d5633c9db215b9ff3047c83c6fb3377281e91e6eae40418e3a34154f7afa3c19edee5411ef08794fcb8fc84e1f2f9eb3c8d0e376bf69c99296 SHA512 b9db554f95148e810076ad3d86abd5f76a4a9942e33def4e31753847e59a7b682088456b7b20e9a1e7a4dc199a7687bd3ea8dfae4fdf691950a737ef2a4f31b6 -EBUILD eclipse-ecj-4.26-r1.ebuild 1457 BLAKE2B 8179101cd909ac75d46e524326fc90db86f17f17d6b5d1db1e21143c146a2ae7e28ee3a4665a300932b4768d50fa4cd0603110697ca2e866f29635078c463515 SHA512 3de5f8557d38b9eabe693a60c3ecb42d8c2ad8e345e05d01a0606ace63114203da622b4f998a4122e29e5b93eb2494e98ad5838919286ff6c0864e13dd3f7405 +EBUILD eclipse-ecj-4.26-r2.ebuild 1788 BLAKE2B 7cb346a266c690ecbdd5a24ca2e5df30de44e18d1c2a262718522fb5224adaeb33c5989d125c26e02eb5c7f974a8f61500a400c83add98c7319258380ec07ec7 SHA512 ad8fbce4e6501645e1dd80ad1b2a888517ef0f04b2abdd9378dadfec8dabe6f301cac6937f91f746b12d42498c0bce849f8f930146c8ca3e475a9c86ac32fca5 EBUILD eclipse-ecj-4.26.ebuild 1691 BLAKE2B 108efc14612f98445a7d8c16145fbb493e15ff39f79feef992ff46dd64a07354b181c6f385f0a6a1282ea5b23c96e65646ce1d326ef43e06e89d4d5ef6a22f09 SHA512 2ff8e9c4337d594e5ef72cdc97451330e42ea47e1df3e18d827adadad07407eed6e7e70fe9a3688e7b41faff966f5d6716c5705dafb9fbcb5c43ec41887b57f0 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.26-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild deleted file mode 100644 index ed2724a7e5d4..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r1.ebuild +++ /dev/null @@ -1,65 +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" - -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.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild new file mode 100644 index 000000000000..8843146e1f91 --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild @@ -0,0 +1,73 @@ +# 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_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 + 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