1 |
caster 11/11/18 21:02:03 |
2 |
|
3 |
Modified: ChangeLog icedtea-7.2.0-r1.ebuild |
4 |
icedtea-6.1.10.4-r1.ebuild |
5 |
Log: |
6 |
Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it used only for ppc/ppc64. This functionality was experimental and brought more problems than benefits. Also remove the bootstrapping with cacao due to failures. Fixes numerous bugs. |
7 |
|
8 |
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.51 dev-java/icedtea/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.51&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.51&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.50&r2=1.51 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v |
20 |
retrieving revision 1.50 |
21 |
retrieving revision 1.51 |
22 |
diff -u -r1.50 -r1.51 |
23 |
--- ChangeLog 18 Nov 2011 18:11:15 -0000 1.50 |
24 |
+++ ChangeLog 18 Nov 2011 21:02:01 -0000 1.51 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-java/icedtea |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.50 2011/11/18 18:11:15 sera Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.51 2011/11/18 21:02:01 caster Exp $ |
30 |
+ |
31 |
+ 18 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.10.4-r1.ebuild, |
32 |
+ icedtea-7.2.0-r1.ebuild: |
33 |
+ Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it |
34 |
+ used only for ppc/ppc64. This functionality was experimental and brought more |
35 |
+ problems than benefits. Also remove the bootstrapping with cacao due to |
36 |
+ failures. Fixes numerous bugs. |
37 |
|
38 |
18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild, |
39 |
icedtea-7.2.0-r1.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.15 dev-java/icedtea/icedtea-7.2.0-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.15&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.15&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.14&r2=1.15 |
48 |
|
49 |
Index: icedtea-7.2.0-r1.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v |
52 |
retrieving revision 1.14 |
53 |
retrieving revision 1.15 |
54 |
diff -u -r1.14 -r1.15 |
55 |
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.14 |
56 |
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 21:02:01 -0000 1.15 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2011 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.14 2011/11/18 18:11:15 sera Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.15 2011/11/18 21:02:01 caster Exp $ |
62 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
63 |
|
64 |
# ********************************************************* |
65 |
@@ -25,8 +25,6 @@ |
66 |
JAXWS_TARBALL="a2ebfdc9db7e.tar.gz" |
67 |
JDK_TARBALL="2054526dd141.tar.gz" |
68 |
LANGTOOLS_TARBALL="9b85f1265346.tar.gz" |
69 |
-CACAO_TARBALL="4549072ab2de.tar.gz" |
70 |
-JAMVM_TARBALL="310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz" |
71 |
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz |
72 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL} |
73 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL} |
74 |
@@ -34,14 +32,13 @@ |
75 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL} |
76 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL} |
77 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL} |
78 |
- http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL} |
79 |
- jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_TARBALL} )" |
80 |
+ http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}" |
81 |
HOMEPAGE="http://icedtea.classpath.org" |
82 |
S=${WORKDIR}/${ICEDTEA_PKG} |
83 |
|
84 |
# Missing options: |
85 |
# shark - needs adding |
86 |
-IUSE="debug doc examples jamvm javascript +nsplugin pulseaudio systemtap +webstart zero" |
87 |
+IUSE="debug doc examples javascript +nsplugin pulseaudio systemtap +webstart" |
88 |
|
89 |
RDEPEND=">=net-print/cups-1.2.12 |
90 |
>=x11-libs/libX11-1.1.3 |
91 |
@@ -63,7 +60,8 @@ |
92 |
x11-proto/xineramaproto |
93 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) |
94 |
javascript? ( dev-java/rhino:1.6 ) |
95 |
- zero? ( virtual/libffi ) |
96 |
+ ppc? ( virtual/libffi ) |
97 |
+ ppc64? ( virtual/libffi ) |
98 |
>=x11-libs/libXrender-0.9.4 |
99 |
systemtap? ( >=dev-util/systemtap-1 ) |
100 |
!dev-java/icedtea:0 |
101 |
@@ -81,7 +79,6 @@ |
102 |
DEPEND="${RDEPEND} |
103 |
|| ( |
104 |
>=dev-java/gcj-jdk-4.3 |
105 |
- >=dev-java/cacao-0.99.2 |
106 |
dev-java/icedtea-bin:7 |
107 |
dev-java/icedtea-bin:6 |
108 |
dev-java/icedtea:7 |
109 |
@@ -107,19 +104,6 @@ |
110 |
JAVA_PKG_WANT_TARGET="1.5" |
111 |
|
112 |
pkg_setup() { |
113 |
-# Shark support disabled for now - still experimental and needs sys-devel/llvm |
114 |
-# if use shark ; then |
115 |
-# if ( ! use x86 && ! use sparc && ! use ppc ) ; then |
116 |
-# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild" |
117 |
-# errror "without the shark USE flag turned on." |
118 |
-# die "Rebuild without the shark USE flag on." |
119 |
-# fi |
120 |
-# if ( ! use zero ) ; then |
121 |
-# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port."; |
122 |
-# die "Rebuild without the shark USE flag on or with the zero USE flag turned on." |
123 |
-# fi |
124 |
-# fi |
125 |
- |
126 |
if use nsplugin && ! use webstart ; then |
127 |
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message." |
128 |
fi |
129 |
@@ -151,8 +135,6 @@ |
130 |
JAVA_PKG_FORCE_VM="icedtea-bin-6" |
131 |
elif has_version dev-java/gcj-jdk; then |
132 |
JAVA_PKG_FORCE_VM="gcj-jdk" |
133 |
- elif has_version dev-java/cacao; then |
134 |
- JAVA_PKG_FORCE_VM="cacao" |
135 |
else |
136 |
die "Unable to find a supported VM for building" |
137 |
fi |
138 |
@@ -193,7 +175,7 @@ |
139 |
elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then |
140 |
# We can't currently bootstrap with a PaX enabled kernel :( |
141 |
host-is-pax && config="${config} --disable-bootstrap" |
142 |
- elif has "${vm}" gcj-jdk cacao; then |
143 |
+ elif has "${vm}" gcj-jdk ; then |
144 |
if host-is-pax; then |
145 |
eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host" |
146 |
eerror "Sorry for the inconvenience" |
147 |
@@ -201,7 +183,7 @@ |
148 |
fi |
149 |
else |
150 |
eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea." |
151 |
- die "Install a GNU Classpath JDK (gcj-jdk, cacao)" |
152 |
+ die "Install a GNU Classpath JDK (gcj-jdk)" |
153 |
fi |
154 |
|
155 |
# OpenJDK-specific parallelism support. Bug #389791, #337827 |
156 |
@@ -211,7 +193,7 @@ |
157 |
config="${config} --with-parallel-jobs=${procs}"; |
158 |
einfo "Configuring using --with-parallel-jobs=${procs}" |
159 |
|
160 |
- if use_zero ; then |
161 |
+ if need_zero ; then |
162 |
config="${config} --enable-zero" |
163 |
else |
164 |
config="${config} --disable-zero" |
165 |
@@ -221,15 +203,6 @@ |
166 |
rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar); |
167 |
fi |
168 |
|
169 |
-# CACAO disabled until it has OpenJDK7 support |
170 |
-# if use cacao ; then |
171 |
-# config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"; |
172 |
-# fi |
173 |
- |
174 |
- if use jamvm ; then |
175 |
- config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"; |
176 |
- fi |
177 |
- |
178 |
unset_vars |
179 |
|
180 |
econf ${config} \ |
181 |
@@ -246,7 +219,8 @@ |
182 |
$(use_enable !debug optimizations) \ |
183 |
$(use_enable doc docs) \ |
184 |
$(use_with javascript rhino ${rhino_jar}) \ |
185 |
- $(use_enable zero) \ |
186 |
+ --disable-cacao \ |
187 |
+ --disable-jamvm \ |
188 |
$(use_enable pulseaudio pulse-java) \ |
189 |
$(use_enable systemtap) |
190 |
} |
191 |
@@ -323,8 +297,8 @@ |
192 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
193 |
} |
194 |
|
195 |
-use_zero() { |
196 |
- use zero || ( ! use amd64 && ! use x86 && ! use sparc ) |
197 |
+need_zero() { |
198 |
+ ! use amd64 && ! use x86 && ! use sparc |
199 |
} |
200 |
|
201 |
pkg_preinst() { |
202 |
|
203 |
|
204 |
|
205 |
1.8 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild |
206 |
|
207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.8&view=markup |
208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.8&content-type=text/plain |
209 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.7&r2=1.8 |
210 |
|
211 |
Index: icedtea-6.1.10.4-r1.ebuild |
212 |
=================================================================== |
213 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v |
214 |
retrieving revision 1.7 |
215 |
retrieving revision 1.8 |
216 |
diff -u -r1.7 -r1.8 |
217 |
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.7 |
218 |
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 21:02:03 -0000 1.8 |
219 |
@@ -1,6 +1,6 @@ |
220 |
# Copyright 1999-2011 Gentoo Foundation |
221 |
# Distributed under the terms of the GNU General Public License v2 |
222 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.7 2011/11/18 18:11:15 sera Exp $ |
223 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $ |
224 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
225 |
|
226 |
# ********************************************************* |
227 |
@@ -25,22 +25,18 @@ |
228 |
JAXWS_TARBALL="jdk6-jaxws-b20.zip" |
229 |
JAF_TARBALL="jdk6-jaf-b20.zip" |
230 |
HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz" |
231 |
-CACAO_TARBALL="c7bf150bfa46.tar.gz" |
232 |
-JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz" |
233 |
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz |
234 |
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} |
235 |
http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL} |
236 |
http://icedtea.classpath.org/download/drops/${JAF_TARBALL} |
237 |
http://icedtea.classpath.org/download/drops/${JAXP_TARBALL} |
238 |
- hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} ) |
239 |
- cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} ) |
240 |
- jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )" |
241 |
+ hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )" |
242 |
HOMEPAGE="http://icedtea.classpath.org" |
243 |
S=${WORKDIR}/${ICEDTEA_PKG} |
244 |
|
245 |
# Missing options: |
246 |
# shark - needs adding |
247 |
-IUSE="cacao debug doc examples +hs20 jamvm javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender zero" |
248 |
+IUSE="debug doc examples +hs20 javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender" |
249 |
|
250 |
# JTReg doesn't pass at present |
251 |
RESTRICT="test" |
252 |
@@ -64,7 +60,8 @@ |
253 |
x11-proto/xineramaproto |
254 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) |
255 |
javascript? ( dev-java/rhino:1.6 ) |
256 |
- zero? ( virtual/libffi ) |
257 |
+ ppc? ( virtual/libffi ) |
258 |
+ ppc64? ( virtual/libffi ) |
259 |
xrender? ( >=x11-libs/libXrender-0.9.4 ) |
260 |
systemtap? ( >=dev-util/systemtap-1 ) |
261 |
!dev-java/icedtea6 |
262 |
@@ -82,7 +79,6 @@ |
263 |
DEPEND="${RDEPEND} |
264 |
|| ( |
265 |
( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 ) |
266 |
- ( >=dev-java/cacao-0.99.2 >=app-admin/eselect-ecj-0.5-r1 ) |
267 |
dev-java/icedtea-bin:6 |
268 |
dev-java/icedtea:${SLOT} |
269 |
) |
270 |
@@ -113,19 +109,6 @@ |
271 |
JAVA_PKG_WANT_TARGET="1.5" |
272 |
|
273 |
pkg_setup() { |
274 |
-# Shark support disabled for now - still experimental and needs sys-devel/llvm |
275 |
-# if use shark ; then |
276 |
-# if ( ! use x86 && ! use sparc && ! use ppc ) ; then |
277 |
-# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild" |
278 |
-# errror "without the shark USE flag turned on." |
279 |
-# die "Rebuild without the shark USE flag on." |
280 |
-# fi |
281 |
-# if ( ! use zero ) ; then |
282 |
-# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port."; |
283 |
-# die "Rebuild without the shark USE flag on or with the zero USE flag turned on." |
284 |
-# fi |
285 |
-# fi |
286 |
- |
287 |
if use nsplugin && ! use webstart ; then |
288 |
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message." |
289 |
fi |
290 |
@@ -151,8 +134,6 @@ |
291 |
JAVA_PKG_FORCE_VM="icedtea-bin-6" |
292 |
elif has_version dev-java/gcj-jdk; then |
293 |
JAVA_PKG_FORCE_VM="gcj-jdk" |
294 |
- elif has_version dev-java/cacao; then |
295 |
- JAVA_PKG_FORCE_VM="cacao" |
296 |
else |
297 |
die "Unable to find a supported VM for building" |
298 |
fi |
299 |
@@ -180,13 +161,13 @@ |
300 |
if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then |
301 |
# If we are upgrading icedtea, then we don't need to bootstrap. |
302 |
config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap" |
303 |
- elif has "${vm}" gcj-jdk cacao; then |
304 |
- # For other 1.5 JDKs e.g. GCJ, CACAO. |
305 |
+ elif has "${vm}" gcj-jdk; then |
306 |
+ # For other 1.5 JDKs e.g. GCJ |
307 |
config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \ |
308 |
config="${config} --with-jdk-home=${vmhome}" |
309 |
else |
310 |
eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}." |
311 |
- die "Install a GNU Classpath JDK (gcj-jdk, cacao)" |
312 |
+ die "Install a GNU Classpath JDK (gcj-jdk)" |
313 |
fi |
314 |
|
315 |
# OpenJDK-specific parallelism support. Bug #389791, #337827 |
316 |
@@ -196,7 +177,7 @@ |
317 |
config="${config} --with-parallel-jobs=${procs}"; |
318 |
einfo "Configuring using --with-parallel-jobs=${procs}" |
319 |
|
320 |
- if use_zero ; then |
321 |
+ if need_zero ; then |
322 |
config="${config} --enable-zero" |
323 |
else |
324 |
config="${config} --disable-zero" |
325 |
@@ -210,14 +191,6 @@ |
326 |
config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}" |
327 |
fi |
328 |
|
329 |
- if use cacao ; then |
330 |
- config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}" |
331 |
- fi |
332 |
- |
333 |
- if use jamvm ; then |
334 |
- config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}" |
335 |
- fi |
336 |
- |
337 |
unset_vars |
338 |
|
339 |
econf ${config} \ |
340 |
@@ -229,8 +202,8 @@ |
341 |
$(use_enable !debug optimizations) \ |
342 |
$(use_enable doc docs) \ |
343 |
$(use_with javascript rhino ${rhino_jar}) \ |
344 |
- $(use_enable cacao) \ |
345 |
- $(use_enable jamvm) \ |
346 |
+ --disable-cacao \ |
347 |
+ --disable-jamvm \ |
348 |
$(use_enable pulseaudio pulse-java) \ |
349 |
$(use_enable xrender) \ |
350 |
$(use_enable systemtap) \ |
351 |
@@ -303,8 +276,8 @@ |
352 |
set_java_env "${T}/icedtea.env" |
353 |
} |
354 |
|
355 |
-use_zero() { |
356 |
- use zero || ( ! use amd64 && ! use x86 && ! use sparc ) |
357 |
+need_zero() { |
358 |
+ ! use amd64 && ! use x86 && ! use sparc |
359 |
} |
360 |
|
361 |
pkg_preinst() { |