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