Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: metadata.xml ChangeLog icedtea-6.1.10.4-r3.ebuild icedtea-7.2.0-r3.ebuild
Date: Fri, 02 Dec 2011 12:27:29
Message-Id: 20111202122718.08FCA2004B@flycatcher.gentoo.org
1 sera 11/12/02 12:27:18
2
3 Modified: metadata.xml ChangeLog
4 Added: icedtea-6.1.10.4-r3.ebuild icedtea-7.2.0-r3.ebuild
5 Log:
6 - Fix bootstrap build for PaX enabled kernels. #389751
7 - Add missing dependency on ecj for use jbootstrap #392337
8 - Don't use eclipse-ecj:3.7 for icedtea:6 #392587
9 - Add various missing dependencies according to scanelf results.
10 icedtea-7: dev-libs/atk sys-devel/gcc sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango nss? ( dev-libs/nss )
11 icedtea-6: dev-libs/glib sys-devel/gcc sys-libs/glibc
12 - Fix libffi dependency for non ppc archs.
13 - Make dependencies optional at runtime as for icedtea-bin for installing via
14 binpkg. Use flags are X alsa cups.
15 - Allow building cacao and jamvm as additional VMs. To use run java -cacao
16 respectively java -jamvm. Use flags are cacao and jamvm.
17
18 (Portage version: 2.1.10.39/cvs/Linux x86_64)
19
20 Revision Changes Path
21 1.12 dev-java/icedtea/metadata.xml
22
23 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.12&view=markup
24 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.12&content-type=text/plain
25 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?r1=1.11&r2=1.12
26
27 Index: metadata.xml
28 ===================================================================
29 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/metadata.xml,v
30 retrieving revision 1.11
31 retrieving revision 1.12
32 diff -u -r1.11 -r1.12
33 --- metadata.xml 28 Nov 2011 15:29:59 -0000 1.11
34 +++ metadata.xml 2 Dec 2011 12:27:17 -0000 1.12
35 @@ -14,9 +14,9 @@
36 </maintainer>
37 <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
38 <use>
39 - <flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag>
40 + <flag name="cacao">Build additionally the CACAO virtual machine.</flag>
41 <flag name="hs20">Use the new version of HotSpot (20).</flag>
42 - <flag name="jamvm">Use the JamVM virtual machine instead of HotSpot.</flag>
43 + <flag name="jamvm">Build additionally the JamVM virtual machine.</flag>
44 <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
45 <flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag>
46 <flag name="nss">Enable NSS security provider support.</flag>
47
48
49
50 1.57 dev-java/icedtea/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.57&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.57&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.56&r2=1.57
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
59 retrieving revision 1.56
60 retrieving revision 1.57
61 diff -u -r1.56 -r1.57
62 --- ChangeLog 28 Nov 2011 15:29:59 -0000 1.56
63 +++ ChangeLog 2 Dec 2011 12:27:17 -0000 1.57
64 @@ -1,290 +1,22 @@
65 # ChangeLog for dev-java/icedtea
66 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.56 2011/11/28 15:29:59 sera Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.57 2011/12/02 12:27:17 sera Exp $
69
70 -*icedtea-7.2.0-r2 (28 Nov 2011)
71 -*icedtea-6.1.10.4-r2 (28 Nov 2011)
72 +*icedtea-7.2.0-r3 (02 Dec 2011)
73 +*icedtea-6.1.10.4-r3 (02 Dec 2011)
74
75 - 28 Nov 2011; Ralph Sennhauser <sera@g.o> +icedtea-6.1.10.4-r2.ebuild,
76 - +icedtea-7.2.0-r2.ebuild, +files/fontconfig.Gentoo.properties.src,
77 - files/icedtea.env, metadata.xml:
78 - Install Gentoo specific fontconfig properties file. #390663
79 - Add missing dependency on pkgconfig. #391987
80 - Add use flag X and cjk to install expected fonts. #349916
81 - Add use flag source and install src.zip conditionally.
82 - Add use flag jbootstrap and make bootstrap optional where possible.
83 - Remove use flag xrender and require libXrender for icedtea:6, icedtea:7 does
84 - this already. #382867
85 - Use @SLOT@ substitution in set_java_env.
86 - Prefixify.
87 -
88 - 25 Nov 2011; Vlastimil Babka <caster@g.o> ChangeLog:
89 - Restore Changelog truncated by mistake, bug #391253.
90 -
91 - 21 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
92 - icedtea-7.2.0-r1.ebuild:
93 - Use java-vm-2.eclass to set PaX markings
94 -
95 - 18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
96 - icedtea-7.2.0-r1.ebuild:
97 - Remove unneeded pkg_postinst
98 -
99 - 18 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.10.4-r1.ebuild,
100 - icedtea-7.2.0-r1.ebuild:
101 - Add missing cpio dep and remove the old libXext version variant, bug #389599.
102 -
103 - 18 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.10.4-r1.ebuild,
104 - icedtea-7.2.0-r1.ebuild:
105 - Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
106 - used only for ppc/ppc64. This functionality was experimental and brought more
107 - problems than benefits. Also remove the bootstrapping with cacao due to
108 - failures. Fixes numerous bugs.
109 -
110 - 18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
111 - icedtea-7.2.0-r1.ebuild:
112 - Add additional PaX markings to executables for x86. Bug 389751
113 -
114 - 18 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.10.4-r1.ebuild,
115 - icedtea-7.2.0-r1.ebuild:
116 - Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
117 - Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
118 -
119 - 18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
120 - icedtea-7.2.0-r1.ebuild:
121 - Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
122 - Bug #389751.
123 -
124 - 13 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-7.2.0-r1.ebuild:
125 - Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
126 - <enhaisa@×××××.com> and Magnus Granberg <zorry@g.o> for their help
127 - finding the patch
128 -
129 - 12 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-7.2.0-r1.ebuild:
130 - Use java-vm_sandbox-predict for installing the controle file
131 -
132 - 11 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-7.2.0-r1.ebuild:
133 - Support building using icedtea-bin-7.
134 -
135 - 10 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
136 - icedtea-7.2.0-r1.ebuild:
137 - Fix building with unusal locales, bug #330433 #389717
138 -
139 - 08 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
140 - icedtea-7.2.0-r1.ebuild:
141 - Allow building of icedtea with icedtea-bin-6, bug 389885
142 -
143 - 07 Nov 2011; Vlastimil Babka <caster@g.o> -icedtea-6.1.10.4.ebuild,
144 - icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild:
145 - Prepare for icedtea-bin version and VMHANDLE migration.
146 -
147 - 06 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-7.2.0-r1.ebuild:
148 - Fix build due to missing ant class when xalan and xerces are not installed,
149 - bug #389625.
150 -
151 - 05 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-7.2.0-r1.ebuild:
152 - Relax lcms dep to allow the stable 2.0a satisfy it.
153 -
154 - 05 Nov 2011; Diego E. Pettenò <flameeyes@g.o> icedtea-7.2.0-r1.ebuild:
155 - QA fix: add missing cpio dependency.
156 -
157 - 04 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-7.2.0-r1.ebuild:
158 - Add ~x86 keyword.
159 -
160 -*icedtea-7.2.0-r1 (04 Nov 2011)
161 -
162 - 04 Nov 2011; Vlastimil Babka <caster@g.o> +icedtea-7.2.0-r1.ebuild:
163 - Version bump from the java-overlay, bug #382485.
164 -
165 - 04 Nov 2011; Vlastimil Babka <caster@g.o>
166 - -files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch:
167 - Remove unused patches.
168 -
169 -*icedtea-6.1.10.4-r1 (04 Nov 2011)
170 -
171 - 04 Nov 2011; Vlastimil Babka <caster@g.o> +icedtea-6.1.10.4-r1.ebuild:
172 - Revbump to use EAPI=4 and change the VMHANDLE icedtea6 to the standard
173 - icedtea-6. System vm setting is upgraded automatically. Any user-vm setting
174 - have to be migrated manually.
175 -
176 - 30 Oct 2011; Vlastimil Babka <caster@g.o> -icedtea-6.1.10.2.ebuild,
177 - -icedtea-6.1.10.3.ebuild, icedtea-6.1.10.4.ebuild:
178 - Package move icedtea6-bin to icedtea-bin.
179 -
180 -*icedtea-6.1.10.4 (21 Oct 2011)
181 -
182 - 21 Oct 2011; Vlastimil Babka <caster@g.o> +icedtea-6.1.10.4.ebuild:
183 - Version bump, security bug #387637.
184 -
185 - 09 Sep 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.10.2.ebuild,
186 - icedtea-6.1.10.3.ebuild:
187 - Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.
188 -
189 -*icedtea-6.1.10.3 (22 Jul 2011)
190 -
191 - 22 Jul 2011; Vlastimil Babka <caster@g.o> +icedtea-6.1.10.3.ebuild:
192 - Version bump, from java-overlay.
193 -
194 - 17 Jul 2011; Vlastimil Babka <caster@g.o> -icedtea-6.1.9.7-r1.ebuild,
195 - -icedtea-6.1.10.ebuild, -icedtea-6.1.10.1.ebuild, icedtea-6.1.10.2.ebuild,
196 - +files/6.1.10.2-371405-linux_version.patch:
197 - Apply patch for Linux 3.* compatibility from overlay, fixing buf #371405.
198 - Remove old versions.
199 -
200 -*icedtea-6.1.10.2 (09 Jun 2011)
201 -
202 - 09 Jun 2011; Vlastimil Babka <caster@g.o> +icedtea-6.1.10.2.ebuild:
203 - Version bump, security bug #370787.
204 -
205 - 22 Apr 2011; Jeroen Roovers <jer@g.o> metadata.xml:
206 - Spelling.
207 -
208 -*icedtea-6.1.10.1 (08 Apr 2011)
209 -
210 - 08 Apr 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.9.7-r1.ebuild,
211 - icedtea-6.1.10.ebuild, +icedtea-6.1.10.1.ebuild, metadata.xml:
212 - Version bump, bug #361921. Restrict libpng deps on older versions.
213 -
214 - 29 Mar 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.9.7-r1.ebuild,
215 - icedtea-6.1.10.ebuild:
216 - Slot GTK+ deps.
217 -
218 -*icedtea-6.1.10 (05 Mar 2011)
219 -
220 - 05 Mar 2011; <caster@g.o> -icedtea-6.1.9.6.ebuild,
221 - +icedtea-6.1.10.ebuild, metadata.xml:
222 - Version bump, bug #357153.
223 -
224 -*icedtea-6.1.9.7-r1 (18 Feb 2011)
225 -
226 - 18 Feb 2011; Vlastimil Babka <caster@g.o> -files/6.1.9.4-sparc.patch,
227 - -icedtea-6.1.9.4.ebuild, -icedtea-6.1.9.5.ebuild, +icedtea-6.1.9.7-r1.ebuild,
228 - -files/6.1.9.5-sparc.patch, -files/icedtea-old.env:
229 - Version bump, security bug #355127. Webstart and nsplugin are now deferred to
230 - separate icedtea-web package via PDEPEND.
231 -
232 -*icedtea-6.1.9.6 (09 Feb 2011)
233 -
234 - 09 Feb 2011; Vlastimil Babka <caster@g.o> +files/6.1.9.6-sparc.patch,
235 - +icedtea-6.1.9.6.ebuild:
236 - Version bump, security bug #354231.
237 -
238 -*icedtea-6.1.9.5 (02 Feb 2011)
239 -
240 - 02 Feb 2011; Vlastimil Babka <caster@g.o> +files/6.1.9.5-sparc.patch,
241 - +icedtea-6.1.9.5.ebuild, +files/icedtea-old.env, -files/6.1.9.3-sparc.patch,
242 - -icedtea-6.1.9.3.ebuild, icedtea-6.1.9.4.ebuild, files/icedtea.env:
243 - Version bump, security bug #353418. Use get_libdir to set proper lib dir in
244 - the env file.
245 -
246 - 21 Jan 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.9.3.ebuild,
247 - icedtea-6.1.9.4.ebuild:
248 - Use virtual/jpeg, bug #347953.
249 -
250 - 21 Jan 2011; Vlastimil Babka <caster@g.o> +files/6.1.9.4-sparc.patch:
251 - Add missing patch from the overlay, sorry. Bug #352314.
252 -
253 -*icedtea-6.1.9.4 (21 Jan 2011)
254 -
255 - 21 Jan 2011; Vlastimil Babka <caster@g.o> -icedtea-6.1.9.1.ebuild,
256 - -icedtea-6.1.9.2.ebuild, +icedtea-6.1.9.4.ebuild:
257 - Version bump, including security fix for CVE-2010-4351: IcedTea JNLP
258 - SecurityManager bypass. Bug #352035.
259 -
260 - 20 Jan 2011; Kacper Kowalik <xarthisius@g.o>
261 - icedtea-6.1.9.3.ebuild:
262 - Mark ~ppc/~ppc64 wrt #308513. Thanks to Kris Hepler <khepler@×××××.com>
263 - for testing.
264 -
265 - 12 Dec 2010; Vlastimil Babka <caster@g.o> +files/6.1.9.3-sparc.patch,
266 - icedtea-6.1.9.3.ebuild:
267 - Add patch for sparc, bug #344659.
268 -
269 - 02 Dec 2010; Vlastimil Babka <caster@g.o> icedtea-6.1.9.3.ebuild,
270 - metadata.xml:
271 - Check that webstart flag is enabled if nsplugin flag is enabled. Document
272 - this in metadata.xml.
273 -
274 -*icedtea-6.1.9.3 (02 Dec 2010)
275 -
276 - 02 Dec 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.9.3.ebuild:
277 - Version bump.
278 -
279 - 26 Nov 2010; Vlastimil Babka <caster@g.o> icedtea-6.1.9.1.ebuild,
280 - icedtea-6.1.9.2.ebuild:
281 - Use versionator for ICEDTEA_VER
282 -
283 -*icedtea-6.1.9.2 (25 Nov 2010)
284 -
285 - 25 Nov 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.9.2.ebuild,
286 - metadata.xml:
287 - Security version bump, bug #346799, thanks to Andrew John Hughes
288 - (gnu_andrew@××××××××××.org). Also adds webstart useflag.
289 -
290 - 14 Nov 2010; Vlastimil Babka <caster@g.o>
291 - -files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.8.0.ebuild,
292 - -icedtea-6.1.8.1.ebuild, -icedtea-6.1.9.ebuild:
293 - Remove old.
294 -
295 - 14 Nov 2010; Vlastimil Babka <caster@g.o> icedtea-6.1.8.0.ebuild,
296 - icedtea-6.1.8.1.ebuild, icedtea-6.1.9.ebuild, icedtea-6.1.9.1.ebuild:
297 - Fix eselect-ecj deps.
298 -
299 -*icedtea-6.1.9.1 (13 Oct 2010)
300 -
301 - 13 Oct 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.9.1.ebuild,
302 - metadata.xml:
303 - Version bump, security bug #340819.
304 -
305 -*icedtea-6.1.9 (09 Sep 2010)
306 -
307 - 09 Sep 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.9.ebuild:
308 - Version bump from java-overlay.
309 -
310 -*icedtea-6.1.8.1 (30 Jul 2010)
311 -
312 - 30 Jul 2010; Vlastimil Babka <caster@g.o> -files/1.7.2-free.patch,
313 - -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild,
314 - -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml:
315 - Security version bump, bug #330205. Remove the older 1.7.x.
316 -
317 -*icedtea-6.1.7.3 (03 May 2010)
318 -
319 - 03 May 2010; Vlastimil Babka <caster@g.o>
320 - +files/6.1.7.3-systemtap-gcc-4.5.patch,
321 - +files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.7.1.ebuild,
322 - +icedtea-6.1.7.3.ebuild, icedtea-6.1.8.0.ebuild:
323 - Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the
324 - 6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay.
325 -
326 - 15 Apr 2010; Vlastimil Babka <caster@g.o> icedtea-6.1.8.0.ebuild:
327 - Add ant-nodeps to DEPEND since it's used in ANT_TASKS variable. Bug
328 - #315457.
329 -
330 -*icedtea-6.1.8.0 (14 Apr 2010)
331 -
332 - 14 Apr 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.8.0.ebuild:
333 - Version bump, based on java-overlay ebuild. Remove the npplugin flag as
334 - upstream removed the old plugin - the npplugin is now installed simply
335 - with USE=nsplugin.
336 -
337 - 31 Mar 2010; Vlastimil Babka <caster@g.o> -icedtea-6.1.7.2.ebuild:
338 - Remove the unpatched revision.
339 -
340 -*icedtea-6.1.7.2-r1 (31 Mar 2010)
341 -
342 - 31 Mar 2010; Vlastimil Babka <caster@g.o> +files/1.7.2-free.patch,
343 - +icedtea-6.1.7.2-r1.ebuild:
344 - Revbump to fix buffer overflow in npplugin.
345 -
346 -*icedtea-6.1.7.2 (31 Mar 2010)
347 -
348 - 31 Mar 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.7.2.ebuild:
349 - Version bump, security bug #312297.
350 -
351 -*icedtea-6.1.7.1 (04 Mar 2010)
352 -
353 - 04 Mar 2010; Vlastimil Babka <caster@g.o> +icedtea-6.1.7.1.ebuild,
354 - +files/generate-cacerts.pl, +files/icedtea.env, +metadata.xml:
355 - Import of ebuild by Andrew John Hughes (gnu_andrew@××××××××××.org) from
356 - java-overlay.
357 + 02 Dec 2011; Ralph Sennhauser <sera@g.o> +icedtea-6.1.10.4-r3.ebuild,
358 + +icedtea-7.2.0-r3.ebuild, metadata.xml:
359 + - Fix bootstrap build for PaX enabled kernels. #389751
360 + - Add missing dependency on ecj for use jbootstrap #392337
361 + - Don't use eclipse-ecj:3.7 for icedtea:6 #392587
362 + - Add various missing dependencies according to scanelf results.
363 + icedtea-7: dev-libs/atk sys-devel/gcc sys-libs/glibc x11-libs/cairo
364 + x11-libs/gdk-pixbuf x11-libs/pango nss? ( dev-libs/nss )
365 + icedtea-6: dev-libs/glib sys-devel/gcc sys-libs/glibc
366 + - Fix libffi dependency for non ppc archs.
367 + - Make dependencies optional at runtime as for icedtea-bin for installing via
368 + binpkg. Use flags are X alsa cups.
369 + - Allow building cacao and jamvm as additional VMs. To use run java -cacao
370 + respectively java -jamvm. Use flags are cacao and jamvm.
371
372
373
374
375 1.1 dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild
376
377 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild?rev=1.1&view=markup
378 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild?rev=1.1&content-type=text/plain
379
380 Index: icedtea-6.1.10.4-r3.ebuild
381 ===================================================================
382 # Copyright 1999-2011 Gentoo Foundation
383 # Distributed under the terms of the GNU General Public License v2
384 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
385 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
386
387 # *********************************************************
388 # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
389 # *********************************************************
390
391 EAPI="4"
392
393 inherit java-pkg-2 java-vm-2 pax-utils prefix versionator
394
395 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
396 OPENJDK_BUILD="22"
397 OPENJDK_DATE="28_feb_2011"
398 OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
399 JAXP_TARBALL="jaxp144_01.zip"
400 JAXWS_TARBALL="jdk6-jaxws-b20.zip"
401 JAF_TARBALL="jdk6-jaf-b20.zip"
402 HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
403 CACAO_TARBALL="c7bf150bfa46.tar.gz" # 17 Mar 2011
404 JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz" # 25 Mar 2011
405 #CACAO_TARBALL="cacao-2204b08fcae9.tar.gz" # 03 Nov 2011
406 #JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" # 10 Oct 2011
407 S=${WORKDIR}/${ICEDTEA_PKG}
408
409 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
410 HOMEPAGE="http://icedtea.classpath.org"
411 SRC_URI="
412 http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
413 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
414 http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
415 http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
416 http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
417 hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
418 cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
419 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
420
421 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
422 SLOT="6"
423 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
424
425 # Missing options: zero shark - for building additional vms
426 IUSE="+X +alsa -cacao cjk +cups debug doc examples +hs20 -jamvm javascript
427 +jbootstrap nio2 +nsplugin +nss pulseaudio +source systemtap +webstart"
428 REQUIRED_USE="
429 cacao? ( jbootstrap )
430 jamvm? ( jbootstrap )"
431
432 # JTReg doesn't pass at present
433 RESTRICT="test"
434
435 # Ideally the following were optional at build time.
436 ALSA_COMMON_DEP="
437 >=media-libs/alsa-lib-1.0"
438 CUPS_COMMON_DEP="
439 >=net-print/cups-1.2.12"
440 X_COMMON_DEP="
441 dev-libs/glib
442 >=media-libs/freetype-2.3.5
443 >=x11-libs/gtk+-2.8:2
444 >=x11-libs/libX11-1.1.3
445 >=x11-libs/libXext-1.1.1
446 >=x11-libs/libXi-1.1.3
447 >=x11-libs/libXrender-0.9.4
448 >=x11-libs/libXtst-1.0.3"
449 X_DEPEND="
450 >=x11-libs/libXau-1.0.3
451 >=x11-libs/libXdmcp-1.0.2
452 >=x11-libs/libXinerama-1.0.2
453 >=x11-libs/libXp-1.0.0
454 x11-proto/inputproto
455 >=x11-proto/xextproto-7.1.1
456 x11-proto/xineramaproto
457 x11-proto/xproto"
458
459 # virtual/libffi is needed for Zero
460 COMMON_DEP="
461 >=media-libs/giflib-4.1.6
462 >=media-libs/libpng-1.2
463 >=sys-devel/gcc-4.3
464 >=sys-libs/glibc-2.11.2
465 >=sys-libs/zlib-1.2.3
466 virtual/jpeg
467 javascript? ( dev-java/rhino:1.6 )
468 nss? ( >=dev-libs/nss-3.12.5-r1 )
469 pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
470 systemtap? ( >=dev-util/systemtap-1 )
471 !amd64? ( !sparc? ( !x86? ( virtual/libffi ) ) )"
472
473 # media-fonts/lklug needs ppc ppc64 keywords
474 RDEPEND="${COMMON_DEP}
475 !dev-java/icedtea6
476 X? (
477 ${X_COMMON_DEP}
478 media-fonts/dejavu
479 cjk? (
480 media-fonts/arphicfonts
481 media-fonts/baekmuk-fonts
482 !ppc? ( !ppc64? ( media-fonts/lklug ) )
483 media-fonts/lohit-fonts
484 media-fonts/sazanami
485 )
486 )
487 alsa? ( ${ALSA_COMMON_DEP} )
488 cups? ( ${CUPS_COMMON_DEP} )"
489
490 # Additional dependencies for building:
491 # zip: extract OpenJDK tarball, and needed by configure
492 # xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
493 # ant, jdk: required to build Java code
494 # ecj: required for bootstrap builds
495 # Only ant-core-1.7.1-r2 and later contain a version of Ant that
496 # properly respects environment variables, if the build
497 # sets some environment variables.
498 # ca-certificates, perl and openssl are used for the cacerts keystore generation
499 # xext headers have two variants depending on version - bug #288855
500 # !eclipse-ecj-3.7 - bug #392587
501 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
502 || (
503 >=dev-java/gcj-jdk-4.3
504 dev-java/icedtea-bin:6
505 dev-java/icedtea:6
506 )
507 app-arch/cpio
508 app-arch/zip
509 app-misc/ca-certificates
510 >=dev-java/ant-core-1.7.1-r2
511 dev-java/ant-nodeps
512 >=dev-java/xalan-2.7.0:0
513 >=dev-java/xerces-2.9.1:2
514 dev-lang/perl
515 dev-libs/openssl
516 dev-util/pkgconfig
517 sys-apps/lsb-release
518 ${X_DEPEND}
519 jbootstrap? (
520 || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
521 )"
522
523 PDEPEND="webstart? ( dev-java/icedtea-web:6 )
524 nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
525
526 # a bit of hack so the VM switching is triggered without causing dependency troubles
527 JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
528 JAVA_PKG_WANT_SOURCE="1.5"
529 JAVA_PKG_WANT_TARGET="1.5"
530
531 pkg_setup() {
532 if use nsplugin && ! use webstart ; then
533 elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
534 fi
535
536 [[ "${MERGE_TYPE}" == "binary" ]] && return #258423
537
538 # icedtea doesn't like some locales. #330433 #389717
539 export LANG="C" LC_ALL="C"
540
541 # quite a hack since java-config does not provide a way for a package
542 # to limit supported VM's for building and their preferred order
543 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
544 einfo "Honoring user-set JAVA_PKG_FORCE_VM"
545 elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
546 JAVA_PKG_FORCE_VM="icedtea6"
547 elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
548 JAVA_PKG_FORCE_VM="icedtea-6"
549 elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
550 JAVA_PKG_FORCE_VM="icedtea6-bin"
551 elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
552 JAVA_PKG_FORCE_VM="icedtea-bin-6"
553 elif has_version dev-java/gcj-jdk; then
554 JAVA_PKG_FORCE_VM="gcj-jdk"
555 else
556 die "Unable to find a supported VM for building"
557 fi
558
559 einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
560 java-vm-2_pkg_setup
561 java-pkg-2_pkg_setup
562 }
563
564 src_unpack() {
565 unpack ${ICEDTEA_PKG}.tar.gz
566 }
567
568 src_configure() {
569 local config bootstrap
570 local vm=$(java-pkg_get-current-vm)
571
572 # IcedTea6 can't be built using IcedTea7; its class files are too new
573 if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
574 use jbootstrap && bootstrap=yes
575 elif has "${vm}" gcj-jdk; then
576 # gcj-jdk ensures ecj is present.
577 use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
578 bootstrap=yes
579 else
580 eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
581 die "Install a GNU Classpath JDK (gcj-jdk)"
582 fi
583
584 if [[ ${bootstrap} ]] ; then
585 local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
586
587 # Don't use eclipse-ecj-3.7 #392587
588 local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
589 ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
590 if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
591 ecj_jar="${ecj_jar%/lib/ecj.jar}"
592 ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
593 ewarn "Found usable: ${ecj_all[@]##*/}"
594 ewarn "using ${ecj_all##*/} instead"
595 ecj_jar="${ecj_all}"/lib/ecj.jar
596 fi
597
598 config="${config} --enable-bootstrap"
599 config="${config} --with-ecj-jar=${ecj_jar}"
600 else
601 config="${config} --disable-bootstrap"
602 fi
603
604 # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
605 if has "${ARCH}" amd64 sparc x86; then
606 config="${config} --disable-zero --disable-cacao --disable-jamvm --disable-shark"
607
608 if [[ ${bootstrap} ]]; then
609 local extra_vms
610 #if use shark; then
611 # extra_vms="${extra_vms},shark"
612 #elif use zero; then
613 # extra_vms="${extra_vms},zero"
614 #fi
615 if use cacao; then
616 extra_vms="${extra_vms},cacao"
617 config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
618 fi
619 if use jamvm; then
620 extra_vms="${extra_vms},jamvm"
621 config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
622 fi
623 if [[ ${extra_vms} ]]; then
624 config="${config} --with-additional-vms=${extra_vms#,}"
625 fi
626 elif use cacao || use jamvm; then
627 ewarn "Can't build additional VMs without bootstrap."
628 ewarn "Rebuild IcedTea with a JDK that allows bootstrapping."
629 fi
630 else
631 config="${config} --enable-zero --disable-cacao --disable-jamvm --disable-shark"
632 # local extra_vms
633 fi
634
635 # OpenJDK-specific parallelism support. Bug #389791, #337827
636 # Implementation modified from waf-utils.eclass
637 # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
638 local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
639 config="${config} --with-parallel-jobs=${procs}";
640 einfo "Configuring using --with-parallel-jobs=${procs}"
641
642 if use javascript ; then
643 config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
644 else
645 config="${config} --without-rhino"
646 fi
647
648 if use hs20 ; then
649 config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
650 fi
651
652 unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
653
654 econf ${config} \
655 --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
656 --with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
657 --with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
658 --with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
659 --with-jdk-home="$(java-config -O)" \
660 --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
661 $(use_enable !debug optimizations) \
662 $(use_enable doc docs) \
663 $(use_enable nio2) \
664 $(use_enable nss) \
665 $(use_enable pulseaudio pulse-java) \
666 $(use_enable systemtap)
667 }
668
669 src_compile() {
670 # Newer versions of Gentoo's ant add
671 # an environment variable so it works properly...
672 export ANT_RESPECT_JAVA_HOME=TRUE
673
674 # ant -diagnostics in Ant 1.8.0 fails without xerces-2 and xalan
675 # We try to load the least that's needed to avoid possible classpath collisions
676 export ANT_TASKS="xerces-2 xalan ant-nodeps"
677
678 # Build and pax mark the intermidiate jdk. #389751
679 if host-is-pax; then
680 emake icedtea-ecj
681 java-vm_set-pax-markings openjdk.build-ecj/j2sdk-image
682 fi
683
684 emake
685 }
686
687 src_install() {
688 local dest="/usr/$(get_libdir)/icedtea${SLOT}"
689 local ddest="${ED}/${dest}"
690 dodir "${dest}"
691
692 dodoc README NEWS AUTHORS THANKYOU
693 dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
694
695 cd openjdk.build/j2sdk-image || die
696
697 # doins can't handle symlinks.
698 cp -vRP bin include jre lib man "${ddest}" || die
699
700 dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
701
702 if use doc; then
703 # java-pkg_dohtml needed for package-list #302654
704 java-pkg_dohtml -r ../docs/* || die
705 fi
706
707 if use examples; then
708 dodir "${dest}/share";
709 cp -vRP demo sample "${ddest}/share/" || die
710 fi
711
712 if use source; then
713 cp src.zip "${ddest}" || die
714 fi
715
716 # Fix the permissions.
717 find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
718
719 # Needs to be done before generating cacerts
720 java-vm_set-pax-markings "${ddest}"
721
722 # We need to generate keystore - bug #273306
723 einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
724 mkdir "${T}/certgen" && cd "${T}/certgen" || die
725 cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
726 for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
727 openssl x509 -text -in "${c}" >> all.crt || die
728 done
729 ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
730 cp -vRP cacerts "${ddest}/jre/lib/security/" || die
731 chmod 644 "${ddest}/jre/lib/security/cacerts" || die
732
733 # Bug 390663
734 cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
735 eprefixify "${T}"/fontconfig.Gentoo.properties
736 insinto "${dest}"/jre/lib
737 doins "${T}"/fontconfig.Gentoo.properties
738
739 set_java_env "${FILESDIR}/icedtea.env"
740 }
741
742 pkg_preinst() {
743 if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
744 # portage would preserve the symlink otherwise, related to bug #384397
745 rm -f "${EROOT}/usr/lib/jvm/icedtea6"
746 elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
747 elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
748 elog "If you had icedtea6 as system VM, the change should be automatic, however"
749 elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
750 elog "and the same holds for any user VM settings. Sorry for the inconvenience."
751 fi
752 }
753
754
755
756 1.1 dev-java/icedtea/icedtea-7.2.0-r3.ebuild
757
758 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild?rev=1.1&view=markup
759 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild?rev=1.1&content-type=text/plain
760
761 Index: icedtea-7.2.0-r3.ebuild
762 ===================================================================
763 # Copyright 1999-2011 Gentoo Foundation
764 # Distributed under the terms of the GNU General Public License v2
765 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
766 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
767
768 # *********************************************************
769 # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
770 # *********************************************************
771
772 EAPI="4"
773
774 inherit java-pkg-2 java-vm-2 pax-utils prefix versionator
775
776 ICEDTEA_PKG=icedtea-$(get_version_component_range 2-3)
777 OPENJDK_TARBALL="0a76e5390e68.tar.gz"
778 CORBA_TARBALL="4d9e4fb8af09.tar.gz"
779 HOTSPOT_TARBALL="b28ae681bae0.tar.gz"
780 JAXP_TARBALL="948e734135ea.tar.gz"
781 JAXWS_TARBALL="a2ebfdc9db7e.tar.gz"
782 JDK_TARBALL="2054526dd141.tar.gz"
783 LANGTOOLS_TARBALL="9b85f1265346.tar.gz"
784 CACAO_TARBALL="4549072ab2de.tar.gz" # 30 Aug 2011
785 JAMVM_TARBALL="jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz" # 26 Sep 2011
786 #CACAO_TARBALL="cacao-2204b08fcae9.tar.gz" # 03 Nov 2011
787 #JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" # 10 Oct 2011
788 S=${WORKDIR}/${ICEDTEA_PKG}
789
790 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
791 HOMEPAGE="http://icedtea.classpath.org"
792 SRC_URI="
793 http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
794 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL}
795 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL}
796 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxp/archive/${JAXP_TARBALL}
797 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
798 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
799 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
800 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}
801 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
802 #cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
803
804 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
805 SLOT="7"
806 KEYWORDS="~amd64 ~x86"
807
808 # Missing options: cacao zero shark - for building additional vms
809 IUSE="+X +alsa cjk +cups debug doc examples -jamvm javascript +jbootstrap
810 +nsplugin +nss pulseaudio +source systemtap +webstart"
811 REQUIRED_USE="
812 jamvm? ( jbootstrap )"
813 #cacao? ( jbootstrap )
814
815 # Ideally the following were optional at build time.
816 ALSA_COMMON_DEP="
817 >=media-libs/alsa-lib-1.0"
818 CUPS_COMMON_DEP="
819 >=net-print/cups-1.2.12"
820 X_COMMON_DEP="
821 >=dev-libs/atk-1.30.0
822 >=dev-libs/glib-2.26
823 media-libs/fontconfig
824 >=media-libs/freetype-2.3.5
825 >=x11-libs/cairo-1.8.8
826 x11-libs/gdk-pixbuf:2
827 >=x11-libs/gtk+-2.8:2
828 >=x11-libs/libX11-1.1.3
829 >=x11-libs/libXext-1.1.1
830 >=x11-libs/libXi-1.1.3
831 >=x11-libs/libXrender-0.9.4
832 >=x11-libs/libXtst-1.0.3
833 >=x11-libs/pango-1.24.5"
834 X_DEPEND="
835 >=x11-libs/libXau-1.0.3
836 >=x11-libs/libXdmcp-1.0.2
837 >=x11-libs/libXinerama-1.0.2
838 >=x11-libs/libXp-1.0.0
839 x11-proto/inputproto
840 >=x11-proto/xextproto-7.1.1
841 x11-proto/xineramaproto
842 x11-proto/xproto"
843
844 # virtual/libffi is needed for Zero
845 COMMON_DEP="
846 >=media-libs/giflib-4.1.6
847 media-libs/lcms:2
848 >=media-libs/libpng-1.2
849 >=sys-devel/gcc-4.3
850 >=sys-libs/glibc-2.11.2
851 >=sys-libs/zlib-1.2.3
852 virtual/jpeg
853 javascript? ( dev-java/rhino:1.6 )
854 nss? ( >=dev-libs/nss-3.12.5-r1 )
855 pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
856 systemtap? ( >=dev-util/systemtap-1 )
857 !amd64? ( !sparc? ( !x86? ( virtual/libffi ) ) )"
858
859 # cups is needed for X. #390945 #390975
860 RDEPEND="${COMMON_DEP}
861 !dev-java/icedtea:0
862 X? (
863 ${CUPS_COMMON_DEP}
864 ${X_COMMON_DEP}
865 media-fonts/dejavu
866 cjk? (
867 media-fonts/arphicfonts
868 media-fonts/baekmuk-fonts
869 media-fonts/lklug
870 media-fonts/lohit-fonts
871 media-fonts/sazanami
872 )
873 )
874 alsa? ( ${ALSA_COMMON_DEP} )
875 cups? ( ${CUPS_COMMON_DEP} )"
876
877 # Additional dependencies for building:
878 # zip: extract OpenJDK tarball, and needed by configure
879 # ant, jdk: required to build Java code
880 # ecj: required for bootstrap builds
881 # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
882 # ca-certificates, perl and openssl are used for the cacerts keystore generation
883 # xext headers have two variants depending on version - bug #288855
884 # autoconf - as long as we use eautoreconf, version restrictions for bug #294918
885 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
886 || (
887 >=dev-java/gcj-jdk-4.3
888 dev-java/icedtea-bin:7
889 dev-java/icedtea-bin:6
890 dev-java/icedtea:7
891 dev-java/icedtea:6
892 )
893 app-arch/cpio
894 app-arch/zip
895 app-misc/ca-certificates
896 >=dev-java/ant-core-1.8.1
897 dev-java/ant-nodeps
898 dev-lang/perl
899 >=dev-libs/libxslt-1.1.26
900 dev-libs/openssl
901 dev-util/pkgconfig
902 sys-apps/attr
903 sys-apps/lsb-release
904 ${X_DEPEND}
905 jbootstrap? (
906 || ( dev-java/eclipse-ecj dev-java/ecj-gcj )
907 )"
908 # || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )"
909
910 PDEPEND="webstart? ( dev-java/icedtea-web:7 )
911 nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
912
913 # a bit of hack so the VM switching is triggered without causing dependency troubles
914 JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
915 JAVA_PKG_WANT_SOURCE="1.5"
916 JAVA_PKG_WANT_TARGET="1.5"
917
918 pkg_setup() {
919 if use nsplugin && ! use webstart ; then
920 elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
921 fi
922
923 [[ "${MERGE_TYPE}" == "binary" ]] && return #258423
924
925 # icedtea doesn't like some locales. #330433 #389717
926 export LANG="C" LC_ALL="C"
927
928 # quite a hack since java-config does not provide a way for a package
929 # to limit supported VM's for building and their preferred order
930 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
931 einfo "Honoring user-set JAVA_PKG_FORCE_VM"
932 elif has_version "<=dev-java/icedtea-7.2.0:7"; then
933 JAVA_PKG_FORCE_VM="icedtea7"
934 elif has_version ">dev-java/icedtea-7.2.0:7"; then
935 JAVA_PKG_FORCE_VM="icedtea-7"
936 elif has_version "dev-java/icedtea-bin:7"; then
937 JAVA_PKG_FORCE_VM="icedtea-bin-7"
938 elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
939 JAVA_PKG_FORCE_VM="icedtea6"
940 elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
941 JAVA_PKG_FORCE_VM="icedtea-6"
942 elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
943 JAVA_PKG_FORCE_VM="icedtea6-bin"
944 elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
945 JAVA_PKG_FORCE_VM="icedtea-bin-6"
946 elif has_version dev-java/gcj-jdk; then
947 JAVA_PKG_FORCE_VM="gcj-jdk"
948 else
949 die "Unable to find a supported VM for building"
950 fi
951
952 einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
953 java-vm-2_pkg_setup
954 java-pkg-2_pkg_setup
955
956 # For bootstrap builds as the sandbox control file might not yet exist.
957 addpredict /proc/self/coredump_filter
958 }
959
960 src_unpack() {
961 unpack ${ICEDTEA_PKG}.tar.gz
962 }
963
964 java_prepare() {
965 # Fix non bootstrap builds with PaX enabled kernels. Bug #389751
966 # Move applying test_gamma.patch to before creating boot copy.
967 if host-is-pax; then
968 sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die
969 sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die
970 export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch
971 fi
972 }
973
974 src_configure() {
975 local config bootstrap
976 local vm=$(java-pkg_get-current-vm)
977
978 if has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
979 use jbootstrap && bootstrap=yes
980 elif has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
981 if use jbootstrap; then
982 einfo "We can't currently bootstrap with a IcedTea6 JVM :("
983 einfo "bootstrap forced off, ignoring use jbootstrap"
984 fi
985 elif has "${vm}" gcj-jdk; then
986 # gcj-jdk ensures ecj is present.
987 use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
988 bootstrap=yes
989 else
990 eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
991 die "Install a GNU Classpath JDK (gcj-jdk)"
992 fi
993
994 if [[ ${bootstrap} ]]; then
995 local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
996
997 config="${config} --enable-bootstrap"
998 config="${config} --with-ecj-jar=${ecj_jar}"
999 else
1000 config="${config} --disable-bootstrap"
1001 fi
1002
1003 # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
1004 if has "${ARCH}" amd64 sparc x86; then
1005 config="${config} --disable-zero --disable-cacao --disable-jamvm --disable-shark"
1006
1007 if [[ ${bootstrap} ]]; then
1008 local extra_vms
1009 #if use shark; then
1010 # extra_vms="${extra_vms},shark"
1011 #elif use zero; then
1012 # extra_vms="${extra_vms},zero"
1013 #fi
1014 # CACAO disabled until it has OpenJDK7 support
1015 #if use cacao; then
1016 # extra_vms="${extra_vms},cacao"
1017 # config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
1018 #fi
1019 if use jamvm; then
1020 extra_vms="${extra_vms},jamvm"
1021 config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
1022 fi
1023 if [[ ${extra_vms} ]]; then
1024 config="${config} --with-additional-vms=${extra_vms#,}"
1025 fi
1026 elif use jamvm; then
1027 ewarn "Can't build additional VMs without bootstrap."
1028 ewarn "Rebuild IcedTea with a JDK that allows bootstrapping."
1029 fi
1030 else
1031 config="${config} --enable-zero --disable-cacao --disable-jamvm --disable-shark"
1032 # local extra_vms
1033 fi
1034
1035 # OpenJDK-specific parallelism support. Bug #389791, #337827
1036 # Implementation modified from waf-utils.eclass
1037 # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
1038 local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
1039 config="${config} --with-parallel-jobs=${procs}";
1040 einfo "Configuring using --with-parallel-jobs=${procs}"
1041
1042 if use javascript ; then
1043 config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
1044 else
1045 config="${config} --without-rhino"
1046 fi
1047
1048 unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
1049
1050 econf ${config} \
1051 --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
1052 --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
1053 --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
1054 --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
1055 --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
1056 --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
1057 --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
1058 --with-jdk-home="$(java-config -O)" \
1059 --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
1060 --disable-jdk-tests \
1061 $(use_enable !debug optimizations) \
1062 $(use_enable doc docs) \
1063 $(use_enable nss) \
1064 $(use_enable pulseaudio pulse-java) \
1065 $(use_enable systemtap)
1066 }
1067
1068 src_compile() {
1069 # Newer versions of Gentoo's ant add
1070 # an environment variable so it works properly...
1071 export ANT_RESPECT_JAVA_HOME=TRUE
1072
1073 # We try to load the least that's needed to avoid possible classpath collisions
1074 export ANT_TASKS="ant-nodeps"
1075
1076 # Build and pax mark the intermidiate jdk. #389751
1077 if host-is-pax; then
1078 emake -j1 icedtea-boot
1079 java-vm_set-pax-markings openjdk.build-boot
1080 fi
1081
1082 emake -j 1
1083 }
1084
1085 src_install() {
1086 local dest="/usr/$(get_libdir)/icedtea${SLOT}"
1087 local ddest="${ED}/${dest}"
1088 dodir "${dest}"
1089
1090 dodoc README NEWS AUTHORS
1091 dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
1092
1093 # http://www.mail-archive.com/openjdk@×××××××××××××××.net/msg06599.html
1094 if use jamvm; then
1095 dosym ${dest}/jre/lib/$(get_system_arch)/jamvm/libjvm.so \
1096 ${dest}/jre/lib/$(get_system_arch)
1097 fi
1098
1099 cd openjdk.build/j2sdk-image || die
1100
1101 # Don't hide classes
1102 rm lib/ct.sym || die
1103
1104 # doins can't handle symlinks.
1105 cp -vRP bin include jre lib man "${ddest}" || die
1106
1107 dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
1108
1109 if use doc; then
1110 # java-pkg_dohtml needed for package-list #302654
1111 java-pkg_dohtml -r ../docs/* || die
1112 fi
1113
1114 if use examples; then
1115 dodir "${dest}/share";
1116 cp -vRP demo sample "${ddest}/share/" || die
1117 fi
1118
1119 if use source; then
1120 cp src.zip "${ddest}" || die
1121 fi
1122
1123 # Fix the permissions.
1124 find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
1125
1126 # Needs to be done before generating cacerts
1127 java-vm_set-pax-markings "${ddest}"
1128
1129 # We need to generate keystore - bug #273306
1130 einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
1131 mkdir "${T}/certgen" && cd "${T}/certgen" || die
1132 cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
1133 for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
1134 openssl x509 -text -in "${c}" >> all.crt || die
1135 done
1136 ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
1137 cp -vRP cacerts "${ddest}/jre/lib/security/" || die
1138 chmod 644 "${ddest}/jre/lib/security/cacerts" || die
1139
1140 # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
1141 # install it anyway. Bug 390663
1142 cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
1143 eprefixify "${T}"/fontconfig.Gentoo.properties
1144 insinto "${dest}"/jre/lib
1145 doins "${T}"/fontconfig.Gentoo.properties
1146
1147 set_java_env "${FILESDIR}/icedtea.env"
1148 java-vm_sandbox-predict /proc/self/coredump_filter
1149 }
1150
1151 pkg_preinst() {
1152 if has_version "<=dev-java/icedtea-7.2.0:7"; then
1153 # portage would preserve the symlink otherwise, related to bug #384397
1154 rm -f "${EROOT}/usr/lib/jvm/icedtea7"
1155 elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
1156 elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
1157 elog "If you had icedtea7 as system VM, the change should be automatic, however"
1158 elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
1159 elog "and the same holds for any user VM settings. Sorry for the inconvenience."
1160 fi
1161 }