From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-java/eclipse-ecj/Manifest | 8 +-- dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild | 4 +- dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild | 76 ------------------------ dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild | 72 ++++++++++++++++++++++ dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild | 62 ------------------- 5 files changed, 77 insertions(+), 145 deletions(-) delete mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild create mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild delete mode 100644 dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild (limited to 'dev-java/eclipse-ecj') diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index fb15ba74fcb1..ebffa2f8ff7c 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,13 +1,11 @@ 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.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f EBUILD eclipse-ecj-4.13-r2.ebuild 1738 BLAKE2B fc8b94e3d55e1a72473c9723b496fef18a5122af2f94c34ed52c929fce8be6703d2a4c8f99ef836a896bbc0c7e6e93d5675db2588f79beb9551e918b251c5864 SHA512 5a4e6e40cd35e1d815f2eb83ca15ad638d5f931a3ad1539147aa716dbae82a89763b51ffcd59490ceee6e80846475ce550654acb45cac5444be1835b080b8ea5 -EBUILD eclipse-ecj-4.15.ebuild 1738 BLAKE2B 2b1eea89420428e432bf7a834f47a04836d491d6dd8049d466c02027cfe9faf83f3a3a5e0e63109e674e600711034e3bec790ee92fc74be5d3ed9944d16a473c SHA512 672d74a8f2a29b1f4d6d3ecd0de797bc08e5e680d6369c9968204a26447fd672abe3980aaa36ba76d53193c6da3d1b8d8c38a39eb2c77cba4a1adcbcdd495db1 -EBUILD eclipse-ecj-4.21.ebuild 1705 BLAKE2B 481cb4f2b95c130f481e9246d91bf0a63c1cb23d0c5cf780473c83fe3401bebb30edb2e125f909725c40c0d3b087ef42090fc4bf41dc35a791a4c12b3df5cf91 SHA512 450f30fc7a3ee77ec65b1f2fdec7129160744e37f4925433dec71bc7af61b7980c863f75576b39632f26cb01e224bdf0b28422c7055751378140862c2fae9228 -EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef +EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B 8f0cf422581ddadc232cad2edb41a3ccc35d3390e99e02caf498b0b50334ef95e70a022c090bbd23fd67b3cd62c5871c3e89801e9b9c6a1c2a3d67e306b7068b SHA512 fd63c0a189d4e2d928674814ba7e681a7f83569937004c28785acb5d7c969db49fc8538c3ca093431e2a3067b432d2889f6e205bc53bec9d07db2302206fe0c4 +EBUILD eclipse-ecj-4.22.ebuild 1693 BLAKE2B 85963cd268d50412c1e185f762b94b040a1d29b3d0c352e155006e5f65d14b7133ab8853e47a86b7c4e45016e9921430671953a21efa7128e6fd3dbbe91be27f SHA512 d644260970dfa5f767962c39d47d513188fa46f09fb8aaa2adcdd63c1e1b3d7f1848c504aaeedb05b83d9d703b096c62604cb0706a482e98344603360b769436 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7 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" 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..000000000000 --- 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 -} 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 000000000000..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 +} 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..000000000000 --- 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 -} -- cgit v1.2.3