commit: 31ee40eea4a57d7623ab0bbdf4431bf009675cac Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 15:54:00 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 15:55:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ee40ee
dev-java/eclipse-ecj: drop old EAPI=4 Closes: https://bugs.gentoo.org/736569 Closes: https://bugs.gentoo.org/740992 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> dev-java/eclipse-ecj/Manifest | 1 - dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild | 97 --------------------------- 2 files changed, 98 deletions(-) diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index 0eecdf15578..7e64b32d88d 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,5 +1,4 @@ DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9 -DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild deleted file mode 100644 index ed2ff2427af..00000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit java-pkg-2 - -MY_PN="ecj" -DMF="R-${PV}-201209141800" - -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.2" -IUSE="+ant userland_GNU" - -COMMON_DEP=" - app-eselect/eselect-java" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.4" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.6 - app-arch/unzip - userland_GNU? ( sys-apps/findutils )" -PDEPEND=" - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )" - -S="${WORKDIR}" - -JAVA_PKG_WANT_SOURCE=1.4 -JAVA_PKG_WANT_TARGET=1.4 - -java_prepare() { - # These have their own package. - rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -fr org/eclipse/jdt/internal/antadapter || die -} - -src_compile() { - local javac_opts javac java jar - - javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1" - javac="$(java-config -c)" - java="$(java-config -J)" - jar="$(java-config -j)" - - find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \ - -path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \ - -print > sources-1.4 - find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6 - - mkdir -p bootstrap || die - cp -pPR org META-INF bootstrap || die - cd "${S}/bootstrap" || die - - einfo "bootstrapping ${MY_PN} with ${javac} ..." - ${javac} ${javac_opts} @../sources-1.4 || die - ${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die - - find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \ - -exec ${jar} cf ${MY_PN}.jar {} + || die - - cd "${S}" || die - einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..." - ${java} -classpath bootstrap/${MY_PN}.jar \ - org.eclipse.jdt.internal.compiler.batch.Main \ - ${javac_opts} -nowarn @sources-1.4 || die - ${java} -classpath bootstrap/${MY_PN}.jar \ - org.eclipse.jdt.internal.compiler.batch.Main \ - -encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die - - find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \ - -exec ${jar} cf ${MY_PN}.jar {} + || die -} - -src_install() { - java-pkg_dolauncher ${MY_PN}-${SLOT} --main \ - org.eclipse.jdt.internal.compiler.batch.Main - - # disable the class version verify, this has intentionally - # some classes with 1.6, but most is 1.4 - JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar -} - -pkg_postinst() { - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ecj-${SLOT} -} - -pkg_postrm() { - eselect ecj update -}
