Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/
Date: Fri, 19 Feb 2016 20:54:30
Message-Id: 1455915255.0dddd045cb181c631be9fe51d037942d6afdfafb.chewi@gentoo
1 commit: 0dddd045cb181c631be9fe51d037942d6afdfafb
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 19 20:51:28 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 19 20:54:15 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dddd045
7
8 dev-java/eclipse-ecj: Remove 3.7
9
10 It doesn't build with Java 8 and we're last-riting its revdep,
11 tomcat-6. Should tomcat-6 return, it can point to a later
12 version. Upstream uses 4.3.
13
14 Package-Manager: portage-2.2.27
15
16 dev-java/eclipse-ecj/Manifest | 1 -
17 dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild | 101 -----------------------
18 2 files changed, 102 deletions(-)
19
20 diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
21 index 6255e04..f91eafb 100644
22 --- a/dev-java/eclipse-ecj/Manifest
23 +++ b/dev-java/eclipse-ecj/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
26 DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
27 DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
28 DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
29
30 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
31 deleted file mode 100644
32 index 3d6a3fc..0000000
33 --- a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
34 +++ /dev/null
35 @@ -1,101 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI="4"
41 -
42 -inherit java-pkg-2
43 -
44 -MY_PN="ecj"
45 -DMF="R-${PV}-201202080800"
46 -
47 -DESCRIPTION="Eclipse Compiler for Java"
48 -HOMEPAGE="http://www.eclipse.org/"
49 -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.jar"
50 -
51 -LICENSE="EPL-1.0"
52 -KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
53 -SLOT="3.7"
54 -IUSE="+ant userland_GNU"
55 -
56 -COMMON_DEP="
57 - app-eselect/eselect-java"
58 -RDEPEND="${COMMON_DEP}
59 - >=virtual/jre-1.4"
60 -DEPEND="${COMMON_DEP}
61 - || ( virtual/jdk:1.7 virtual/jdk:1.6 )
62 - app-arch/unzip
63 - userland_GNU? ( sys-apps/findutils )"
64 -PDEPEND="
65 - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
66 -
67 -S="${WORKDIR}"
68 -
69 -JAVA_PKG_WANT_SOURCE=1.4
70 -JAVA_PKG_WANT_TARGET=1.4
71 -
72 -java_prepare() {
73 - # These have their own package.
74 - rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
75 - rm -fr org/eclipse/jdt/internal/antadapter || die
76 -
77 - # upstream build.xml excludes this
78 - rm META-INF/eclipse.inf
79 -}
80 -
81 -src_compile() {
82 - local javac_opts javac java jar
83 -
84 - javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
85 - javac="$(java-config -c)"
86 - java="$(java-config -J)"
87 - jar="$(java-config -j)"
88 -
89 - find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
90 - -path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
91 - -print > sources-1.4
92 - find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
93 -
94 - mkdir -p bootstrap || die
95 - cp -pPR org bootstrap || die
96 - cd "${S}/bootstrap" || die
97 -
98 - einfo "bootstrapping ${MY_PN} with ${javac} ..."
99 - ${javac} ${javac_opts} @../sources-1.4 || die
100 - ${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
101 -
102 - find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
103 - -exec ${jar} cf ${MY_PN}.jar {} + || die
104 -
105 - cd "${S}" || die
106 - einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
107 - ${java} -classpath bootstrap/${MY_PN}.jar \
108 - org.eclipse.jdt.internal.compiler.batch.Main \
109 - ${javac_opts} -nowarn @sources-1.4 || die
110 - ${java} -classpath bootstrap/${MY_PN}.jar \
111 - org.eclipse.jdt.internal.compiler.batch.Main \
112 - -encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
113 -
114 - find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
115 - -exec ${jar} cf ${MY_PN}.jar {} + || die
116 -}
117 -
118 -src_install() {
119 - java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
120 - org.eclipse.jdt.internal.compiler.batch.Main
121 -
122 - # disable the class version verify, this has intentionally
123 - # some classes with 1.6, but most is 1.4
124 - JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
125 -}
126 -
127 -pkg_postinst() {
128 - einfo "To select between slots of ECJ..."
129 - einfo " # eselect ecj"
130 -
131 - eselect ecj update ecj-${SLOT}
132 -}
133 -
134 -pkg_postrm() {
135 - eselect ecj update
136 -}