1 |
betelgeuse 08/09/27 12:02:01 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: eclipse-ecj-3.4-r3.ebuild |
5 |
Log: |
6 |
Use EAPI 2 use dependencies for gcj. |
7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.47 dev-java/eclipse-ecj/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/ChangeLog?rev=1.47&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/ChangeLog?rev=1.47&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/ChangeLog?r1=1.46&r2=1.47 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v |
19 |
retrieving revision 1.46 |
20 |
retrieving revision 1.47 |
21 |
diff -u -r1.46 -r1.47 |
22 |
--- ChangeLog 27 Sep 2008 11:53:45 -0000 1.46 |
23 |
+++ ChangeLog 27 Sep 2008 12:02:01 -0000 1.47 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for dev-java/eclipse-ecj |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.46 2008/09/27 11:53:45 betelgeuse Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.47 2008/09/27 12:02:01 betelgeuse Exp $ |
29 |
+ |
30 |
+*eclipse-ecj-3.4-r3 (27 Sep 2008) |
31 |
+ |
32 |
+ 27 Sep 2008; Petteri Räty <betelgeuse@g.o> |
33 |
+ +eclipse-ecj-3.4-r3.ebuild: |
34 |
+ Use EAPI 2 use dependencies for gcj. |
35 |
|
36 |
27 Sep 2008; Petteri Räty <betelgeuse@g.o> |
37 |
eclipse-ecj-3.4-r2.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: eclipse-ecj-3.4-r3.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2008 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild,v 1.1 2008/09/27 12:02:01 betelgeuse Exp $ |
51 |
|
52 |
EAPI=2 |
53 |
|
54 |
inherit java-pkg-2 |
55 |
|
56 |
MY_PN="ecj" |
57 |
DMF="R-${PV}-200806172000" |
58 |
S="${WORKDIR}" |
59 |
|
60 |
DESCRIPTION="Eclipse Compiler for Java" |
61 |
HOMEPAGE="http://www.eclipse.org/" |
62 |
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip" |
63 |
|
64 |
IUSE="gcj java6" |
65 |
|
66 |
LICENSE="EPL-1.0" |
67 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
68 |
SLOT="3.4" |
69 |
|
70 |
CDEPEND=">=app-admin/eselect-ecj-0.3 |
71 |
sys-devel/gcc[gcj?]" |
72 |
DEPEND="${CDEPEND} |
73 |
!gcj? ( !java6? ( >=virtual/jdk-1.4 ) |
74 |
java6? ( >=virtual/jdk-1.6 ) )" |
75 |
RDEPEND="${CDEPEND} |
76 |
!gcj? ( !java6? ( >=virtual/jre-1.4 ) |
77 |
java6? ( >=virtual/jre-1.6 ) )" |
78 |
|
79 |
pkg_setup() { |
80 |
if ! use gcj ; then |
81 |
java-pkg-2_pkg_setup |
82 |
fi |
83 |
} |
84 |
|
85 |
src_unpack() { |
86 |
unpack ${A} |
87 |
cd "${S}" || die |
88 |
|
89 |
# These have their own package. |
90 |
rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die |
91 |
rm -fr org/eclipse/jdt/internal/antadapter || die |
92 |
|
93 |
if use gcj || ! use java6 ; then |
94 |
rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die |
95 |
fi |
96 |
} |
97 |
|
98 |
src_compile() { |
99 |
local javac_opts javac java jar |
100 |
|
101 |
if use gcj ; then |
102 |
local gccbin="$(gcc-config -B $(ls -1r /etc/env.d/gcc/${CHOST}-* | head -1) || die)" |
103 |
local gcj="${gccbin}/gcj" |
104 |
javac="${gcj} -C -encoding ISO-8859-1" |
105 |
jar="${gccbin}/gjar" |
106 |
[[ -x ${jar} ]] || jar="${gccbin}/fastjar" |
107 |
[[ -x ${jar} ]] || die "No jar found for gcc" |
108 |
java="${gccbin}/gij" |
109 |
else |
110 |
javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1" |
111 |
javac="$(java-config -c)" |
112 |
java="$(java-config -J)" |
113 |
jar="$(java-config -j)" |
114 |
fi |
115 |
|
116 |
mkdir -p bootstrap || die |
117 |
cp -a org bootstrap || die |
118 |
cd "${S}/bootstrap" || die |
119 |
|
120 |
einfo "bootstrapping ${MY_PN} with ${javac} ..." |
121 |
${javac} ${javac_opts} $(find org/ -name '*.java') || die |
122 |
find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\ |
123 |
xargs ${jar} cf ${MY_PN}.jar |
124 |
|
125 |
cd "${S}" || die |
126 |
einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..." |
127 |
${java} -classpath bootstrap/${MY_PN}.jar \ |
128 |
org.eclipse.jdt.internal.compiler.batch.Main \ |
129 |
${javac_opts} -nowarn org || die |
130 |
find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\ |
131 |
xargs ${jar} cf ${MY_PN}.jar |
132 |
|
133 |
if use gcj ; then |
134 |
einfo "Building native ${MY_PN} binary ..." |
135 |
${gcj} ${CFLAGS} -findirect-dispatch -Wl,-Bsymbolic -o native_${MY_PN}-${SLOT} \ |
136 |
--main=org.eclipse.jdt.internal.compiler.batch.Main ${MY_PN}.jar || die |
137 |
fi |
138 |
} |
139 |
|
140 |
src_install() { |
141 |
if use gcj ; then |
142 |
dobin native_${MY_PN}-${SLOT} |
143 |
newbin "${FILESDIR}/ecj-${SLOT}" ${MY_PN}-${SLOT} |
144 |
|
145 |
# Don't complain when doing dojar below. |
146 |
JAVA_PKG_WANT_SOURCE=1.4 |
147 |
JAVA_PKG_WANT_TARGET=1.4 |
148 |
else |
149 |
java-pkg_dolauncher ${MY_PN}-${SLOT} --main \ |
150 |
org.eclipse.jdt.internal.compiler.batch.Main |
151 |
fi |
152 |
|
153 |
java-pkg_dojar ${MY_PN}.jar |
154 |
} |
155 |
|
156 |
pkg_postinst() { |
157 |
einfo "To get the Compiler Adapter of ECJ for ANT..." |
158 |
einfo " # emerge ant-eclipse-ecj" |
159 |
echo |
160 |
einfo "To select between slots of ECJ..." |
161 |
einfo " # eselect ecj" |
162 |
|
163 |
eselect ecj update ecj-${SLOT} |
164 |
} |
165 |
|
166 |
pkg_postrm() { |
167 |
eselect ecj update |
168 |
} |