Version bump, move from java-overlay.

Always uses CACAO as best alternative JVM if HotSpot isn't available.
USE=-X, don't install X11GraphicsEnvironment. #399367
Add revdep mask for reduced installs. (-X, -alsa, -cups) #400691, #401621

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

6 files changed, 842 insertions, 320 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 6bbd713309c1..a01d8eeeb089 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,314 +1,15 @@
 # ChangeLog for dev-java/icedtea
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.59 2011/12/21 10:15:05 sera Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.60 2012/02/06 06:49:00 sera Exp $
 
-  21 Dec 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r3.ebuild:
-  Fix dosym usage. #395391
+*icedtea-6.1.11 (06 Feb 2012)
+*icedtea-6.1.10.5 (06 Feb 2012)
 
-  02 Dec 2011; Ralph Sennhauser <sera@gentoo.org> ChangeLog:
-  Restore ChangeLog truncated by mistake, bug #391253.
-
-*icedtea-7.2.0-r3 (02 Dec 2011)
-*icedtea-6.1.10.4-r3 (02 Dec 2011)
-
-  02 Dec 2011; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.10.4-r3.ebuild,
-  +icedtea-7.2.0-r3.ebuild, metadata.xml:
-  - Fix bootstrap build for PaX enabled kernels. #389751
-  - Add missing dependency on ecj for use jbootstrap #392337
-  - Don't use eclipse-ecj:3.7 for icedtea:6 #392587
-  - Add various missing dependencies according to scanelf results.
-  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 )
-  icedtea-6: dev-libs/glib sys-devel/gcc sys-libs/glibc
-  - Fix libffi dependency for non ppc archs.
-  - Make dependencies optional at runtime as for icedtea-bin for installing via
-  binpkg. Use flags are X alsa cups.
-  - Allow building cacao and jamvm as additional VMs. To use run java -cacao
-  respectively java -jamvm. Use flags are cacao and jamvm.
-
-*icedtea-7.2.0-r2 (28 Nov 2011)
-*icedtea-6.1.10.4-r2 (28 Nov 2011)
-
-  28 Nov 2011; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.10.4-r2.ebuild,
-  +icedtea-7.2.0-r2.ebuild, +files/fontconfig.Gentoo.properties.src,
-  files/icedtea.env, metadata.xml:
-  Install Gentoo specific fontconfig properties file. #390663
-  Add missing dependency on pkgconfig. #391987
-  Add use flag X and cjk to install expected fonts. #349916
-  Add use flag source and install src.zip conditionally.
-  Add use flag jbootstrap and make bootstrap optional where possible.
-  Remove use flag xrender and require libXrender for icedtea:6, icedtea:7 does
-  this already. #382867
-  Use @SLOT@ substitution in set_java_env.
-  Prefixify.
-
-  25 Nov 2011; Vlastimil Babka <caster@gentoo.org> ChangeLog:
-  Restore Changelog truncated by mistake, bug #391253.
-
-  21 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Use java-vm-2.eclass to set PaX markings
-
-  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Remove unneeded pkg_postinst
-
-  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Add missing cpio dep and remove the old libXext version variant, bug #389599.
-
-  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
-  used only for ppc/ppc64. This functionality was experimental and brought more
-  problems than benefits. Also remove the bootstrapping with cacao due to
-  failures. Fixes numerous bugs.
-
-  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Add additional PaX markings to executables for x86. Bug 389751
-
-  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
-  Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
-
-  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
-  Bug #389751.
-
-  13 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
-  <enhaisa@gmail.com> and Magnus Granberg <zorry@gentoo.org> for their help
-  finding the patch
-
-  12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Use java-vm_sandbox-predict for installing the controle file
-
-  11 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Support building using icedtea-bin-7.
-
-  10 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Fix building with unusal locales, bug #330433 #389717
-
-  08 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Allow building of icedtea with icedtea-bin-6, bug 389885
-
-  07 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.4.ebuild,
-  icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild:
-  Prepare for icedtea-bin version and VMHANDLE migration.
-
-  06 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Fix build due to missing ant class when xalan and xerces are not installed,
-  bug #389625.
-
-  05 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Relax lcms dep to allow the stable 2.0a satisfy it.
-
-  05 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  QA fix: add missing cpio dependency.
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Add ~x86 keyword.
-
-*icedtea-7.2.0-r1 (04 Nov 2011)
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-7.2.0-r1.ebuild:
-  Version bump from the java-overlay, bug #382485.
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
-  -files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch:
-  Remove unused patches.
-
-*icedtea-6.1.10.4-r1 (04 Nov 2011)
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4-r1.ebuild:
-  Revbump to use EAPI=4 and change the VMHANDLE icedtea6 to the standard
-  icedtea-6. System vm setting is upgraded automatically. Any user-vm setting
-  have to be migrated manually.
-
-  30 Oct 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.2.ebuild,
-  -icedtea-6.1.10.3.ebuild, icedtea-6.1.10.4.ebuild:
-  Package move icedtea6-bin to icedtea-bin.
-
-*icedtea-6.1.10.4 (21 Oct 2011)
-
-  21 Oct 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4.ebuild:
-  Version bump, security bug #387637.
-
-  09 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.2.ebuild,
-  icedtea-6.1.10.3.ebuild:
-  Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.
-
-*icedtea-6.1.10.3 (22 Jul 2011)
-
-  22 Jul 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.3.ebuild:
-  Version bump, from java-overlay.
-
-  17 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.9.7-r1.ebuild,
-  -icedtea-6.1.10.ebuild, -icedtea-6.1.10.1.ebuild, icedtea-6.1.10.2.ebuild,
-  +files/6.1.10.2-371405-linux_version.patch:
-  Apply patch for Linux 3.* compatibility from overlay, fixing buf #371405.
-  Remove old versions.
-
-*icedtea-6.1.10.2 (09 Jun 2011)
-
-  09 Jun 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.2.ebuild:
-  Version bump, security bug #370787.
-
-  22 Apr 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  Spelling.
-
-*icedtea-6.1.10.1 (08 Apr 2011)
-
-  08 Apr 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
-  icedtea-6.1.10.ebuild, +icedtea-6.1.10.1.ebuild, metadata.xml:
-  Version bump, bug #361921. Restrict libpng deps on older versions.
-
-  29 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
-  icedtea-6.1.10.ebuild:
-  Slot GTK+ deps.
-
-*icedtea-6.1.10 (05 Mar 2011)
-
-  05 Mar 2011; <caster@gentoo.org> -icedtea-6.1.9.6.ebuild,
-  +icedtea-6.1.10.ebuild, metadata.xml:
-  Version bump, bug #357153.
-
-*icedtea-6.1.9.7-r1 (18 Feb 2011)
-
-  18 Feb 2011; Vlastimil Babka <caster@gentoo.org> -files/6.1.9.4-sparc.patch,
-  -icedtea-6.1.9.4.ebuild, -icedtea-6.1.9.5.ebuild, +icedtea-6.1.9.7-r1.ebuild,
-  -files/6.1.9.5-sparc.patch, -files/icedtea-old.env:
-  Version bump, security bug #355127. Webstart and nsplugin are now deferred to
-  separate icedtea-web package via PDEPEND.
-
-*icedtea-6.1.9.6 (09 Feb 2011)
-
-  09 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.6-sparc.patch,
-  +icedtea-6.1.9.6.ebuild:
-  Version bump, security bug #354231.
-
-*icedtea-6.1.9.5 (02 Feb 2011)
-
-  02 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.5-sparc.patch,
-  +icedtea-6.1.9.5.ebuild, +files/icedtea-old.env, -files/6.1.9.3-sparc.patch,
-  -icedtea-6.1.9.3.ebuild, icedtea-6.1.9.4.ebuild, files/icedtea.env:
-  Version bump, security bug #353418. Use get_libdir to set proper lib dir in
-  the env file.
-
-  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
-  icedtea-6.1.9.4.ebuild:
-  Use virtual/jpeg, bug #347953.
-
-  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.4-sparc.patch:
-  Add missing patch from the overlay, sorry. Bug #352314.
-
-*icedtea-6.1.9.4 (21 Jan 2011)
-
-  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.9.1.ebuild,
-  -icedtea-6.1.9.2.ebuild, +icedtea-6.1.9.4.ebuild:
-  Version bump, including security fix for CVE-2010-4351: IcedTea JNLP
-  SecurityManager bypass. Bug #352035.
-
-  20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  icedtea-6.1.9.3.ebuild:
-  Mark ~ppc/~ppc64 wrt #308513. Thanks to Kris Hepler <khepler@gmail.com>
-  for testing.
-
-  12 Dec 2010; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.3-sparc.patch,
-  icedtea-6.1.9.3.ebuild:
-  Add patch for sparc, bug #344659.
-
-  02 Dec 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
-  metadata.xml:
-  Check that webstart flag is enabled if nsplugin flag is enabled. Document
-  this in metadata.xml.
-
-*icedtea-6.1.9.3 (02 Dec 2010)
-
-  02 Dec 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.3.ebuild:
-  Version bump.
-
-  26 Nov 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.1.ebuild,
-  icedtea-6.1.9.2.ebuild:
-  Use versionator for ICEDTEA_VER
-
-*icedtea-6.1.9.2 (25 Nov 2010)
-
-  25 Nov 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.2.ebuild,
+  06 Feb 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.10.5.ebuild,
+  +icedtea-6.1.11.ebuild, +files/icedtea-6_pax_kernel_support.patch,
   metadata.xml:
-  Security version bump, bug #346799, thanks to Andrew John Hughes
-  (gnu_andrew@member.fsf.org). Also adds webstart useflag.
-
-  14 Nov 2010; Vlastimil Babka <caster@gentoo.org>
-  -files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.8.0.ebuild,
-  -icedtea-6.1.8.1.ebuild, -icedtea-6.1.9.ebuild:
-  Remove old.
-
-  14 Nov 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild,
-  icedtea-6.1.8.1.ebuild, icedtea-6.1.9.ebuild, icedtea-6.1.9.1.ebuild:
-  Fix eselect-ecj deps.
-
-*icedtea-6.1.9.1 (13 Oct 2010)
-
-  13 Oct 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.1.ebuild,
-  metadata.xml:
-  Version bump, security bug #340819.
-
-*icedtea-6.1.9 (09 Sep 2010)
-
-  09 Sep 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.ebuild:
-  Version bump from java-overlay.
-
-*icedtea-6.1.8.1 (30 Jul 2010)
-
-  30 Jul 2010; Vlastimil Babka <caster@gentoo.org> -files/1.7.2-free.patch,
-  -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild,
-  -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml:
-  Security version bump, bug #330205. Remove the older 1.7.x.
-
-*icedtea-6.1.7.3 (03 May 2010)
-
-  03 May 2010; Vlastimil Babka <caster@gentoo.org>
-  +files/6.1.7.3-systemtap-gcc-4.5.patch,
-  +files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.7.1.ebuild,
-  +icedtea-6.1.7.3.ebuild, icedtea-6.1.8.0.ebuild:
-  Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the
-  6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay.
-
-  15 Apr 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild:
-  Add ant-nodeps to DEPEND since it's used in ANT_TASKS variable. Bug
-  #315457.
-
-*icedtea-6.1.8.0 (14 Apr 2010)
-
-  14 Apr 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.8.0.ebuild:
-  Version bump, based on java-overlay ebuild. Remove the npplugin flag as
-  upstream removed the old plugin - the npplugin is now installed simply
-  with USE=nsplugin.
-
-  31 Mar 2010; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.7.2.ebuild:
-  Remove the unpatched revision.
-
-*icedtea-6.1.7.2-r1 (31 Mar 2010)
-
-  31 Mar 2010; Vlastimil Babka <caster@gentoo.org> +files/1.7.2-free.patch,
-  +icedtea-6.1.7.2-r1.ebuild:
-  Revbump to fix buffer overflow in npplugin.
-
-*icedtea-6.1.7.2 (31 Mar 2010)
-
-  31 Mar 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.7.2.ebuild:
-  Version bump, security bug #312297.
-
-*icedtea-6.1.7.1 (04 Mar 2010)
-
-  04 Mar 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.7.1.ebuild,
-  +files/generate-cacerts.pl, +files/icedtea.env, +metadata.xml:
-  Import of ebuild by Andrew John Hughes (gnu_andrew@member.fsf.org) from
-  java-overlay.
+  Version bump, move from java-overlay.
+  Always uses CACAO as best alternative JVM if HotSpot isn't available.
+  USE=-X, don't install X11GraphicsEnvironment. #399367
+  Add revdep mask for reduced installs. (-X, -alsa, -cups) #400691, #401621
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index c32d519166a9..67f261d738cf 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
+AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
 AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
 DIST 0a76e5390e68.tar.gz 128547 RMD160 ea975ce953ec0eb5751ea2aee8d3dc98da6933ff SHA1 9fc523399df6a8736ce540f7d7f0412188eb8b51 SHA256 bb47d452a61ed154fad98fda35f93e6e0f3328632ef2cf0afa1d95cd6264071e
 DIST 2054526dd141.tar.gz 43372283 RMD160 8dc2e49901a76819b1ea4f19df2d0a826e8cc323 SHA1 ea2662295c3c248f932df56a13993c4efdc78397 SHA256 4cd94391909ca86d2a5e25e3378c8fde1b1368076577fc58fed57097932750e1
@@ -12,31 +13,39 @@ DIST 9b85f1265346.tar.gz 2276207 RMD160 39bad7830bb5848efae424192ba54811f6285dbe
 DIST a2ebfdc9db7e.tar.gz 2760030 RMD160 b1e678045ed8f8c4047760799bc25f94083a76f3 SHA1 830de9e94c710eb38f2ca029de4166fd5672412c SHA256 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8
 DIST b28ae681bae0.tar.gz 9000397 RMD160 0044bc2978f1eab6fb81b5181049f52a5447522d SHA1 4bbcfed2cec6e34bd6c3880d272be742c058c019 SHA256 dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64
 DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee
+DIST cff92704c4e0.tar.gz 4261719 RMD160 cf01828a98a6e3139ce33761b2b0f87b0ee6ad48 SHA1 043845bfc67f58e30ee68d9a47f33385ab67702b SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST icedtea-2.0.tar.gz 4516180 RMD160 91e75405713ead34c7831fd23ce66871bf888427 SHA1 aa2399f951044b82f5ecf7318a8358eb08413afb SHA256 2485d5e7807658bc3488c7e6d4720ef1261a31dd698ce2641f541119e0c2387a
 DIST icedtea6-1.10.4.tar.gz 6821129 RMD160 4de37c2086ddcebd2e48004aaa6035870394265c SHA1 b38818a80f2635e21457c6230031e5f7493e6acd SHA256 15491d7f2f81436aaf87f964d923b95b4bda8f6689198b4999961070b6c68851
+DIST icedtea6-1.10.5.tar.gz 6831721 RMD160 24e3c22dafaba9aac21b84643127c2e92f1dc2dd SHA1 ba260275bcfbbbaff153c99b066d2f4ba7a12270 SHA256 7d0f9e833a42b6af308a34d432431f0528a2efa52d7837aa446d1c4c27161a0c
+DIST icedtea6-1.11.tar.gz 6334120 RMD160 7037d10072335e1abba264c59713c378c47ba950 SHA1 ec53c683043716bd29611ecb3e9c6f2e89984e72 SHA256 e7d2bc08008de918ca54f8dcd1f8d75c7829948da6b1a9c06761c74a563c3eba
 DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
 DIST jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz 288269 RMD160 9f0dafecf766ae27ad19ed1b6d12fdd59104fbd3 SHA1 b5e304b60f274d0ed59c7888e2340a2f043df4f5 SHA256 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
+DIST jaxp144_03.zip 5964999 RMD160 3184f086991075779bcd663e55e24fec5cff1728 SHA1 28c441ccaa2883e6308cff0cf8b51c893da25ff7 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
+DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 RMD160 eef414a11dbcaafd2f830ca34227a869a1af1033 SHA1 e5e86fd4be4c58f8820893437e5e95cff083e757 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
+DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da114b986336e106cba16c SHA1 5d6fe1e3ef84d6699bff18eabf109e63d6c0a1c3 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
 EBUILD icedtea-6.1.10.4-r1.ebuild 9804 RMD160 b7de7c4ac7647af1ba1fcd146a9c04ec565ccf03 SHA1 e9ee85077138583b0079666801c17ee560729138 SHA256 e44ad3485c00e59c015f40b1e33ca327fd8f98b9ce3625799ea1daed24018afc
 EBUILD icedtea-6.1.10.4-r2.ebuild 10458 RMD160 2b187dfacb02eee4eccd95e4b14307719f41e046 SHA1 c331c72b9699955e7de24bf8ad90de17af060910 SHA256 9ffe67c06a5a8afbb5c8b23e7cc6f5c9ac132ede30b6500a263aeb48132259c2
 EBUILD icedtea-6.1.10.4-r3.ebuild 12502 RMD160 8570eb806f185bb9f4b2d480aad5bbc0c199909c SHA1 290e0a70e97c87c199afaf241d664e17bf9744ed SHA256 a78c17ad9fb509149dc55536b58efb36f58936efdd4e8e910befb2a07e2c05a9
+EBUILD icedtea-6.1.10.5.ebuild 11116 RMD160 5828a69103c02685751fc024b37d577911a123ba SHA1 212c52e360185f9fcd630749c30a83f950be38f3 SHA256 7b0d63b2af7e8283dc86e16e6352eb87fd4b69a3acab8e9b7bae075f3b7099a1
+EBUILD icedtea-6.1.11.ebuild 10673 RMD160 dca7d6fc5d6de05fa4d210ef9906168b62ae7e20 SHA1 5293aaa938ce1b84d8ae8e50b7618ba578a43924 SHA256 b2c35eee36c054f338cf6cc73f2c47fed203dd761ac3c6d5b86424bf0457052f
 EBUILD icedtea-7.2.0-r1.ebuild 10801 RMD160 c9ff94b4bfea1a7fa93457a4be2fb90fc24c5823 SHA1 e4bf6bf1fe1d1db7eb5fd963ed3600c9725fa0c1 SHA256 eb9e2c4e0bdd19cac0d903356f3a673b7ab68cef38cbf68423cba858b534c9fa
 EBUILD icedtea-7.2.0-r2.ebuild 11502 RMD160 f610645dbe8a6c2828730cf08cc88fcb16c6755a SHA1 bfff69d1d821f4e92bb8d4996b951103d81279a2 SHA256 2fa6ff0b5bcfb0cbd4ca77dca6a8e23408f29fe41da1c45f655cc8021d47ec87
 EBUILD icedtea-7.2.0-r3.ebuild 13661 RMD160 7495626ba9d32670414d2f47caeca4721d64bd70 SHA1 b15199fb21bae06a97e9626bdf8968d2798b0a16 SHA256 a1c6a9ff9da4fb1ff8a1dd51e2c03a117d46341c451de2d0ed303be710dbcd8e
-MISC ChangeLog 12447 RMD160 c4b2ad869a8a307ea12b8a517346f09ffe9669b8 SHA1 44fef57f382aac33e773b0c84b66ed307d1c201c SHA256 8108eb845d077d572bb89437c3a072681a195d8933ef363a968272453a0962c8
-MISC metadata.xml 1621 RMD160 57d3af77ff94701a5dc3d3e3017a73f18d754f17 SHA1 6017ee304b545abe90caafb868a2a08e9ba7a1f9 SHA256 5c5b7766a28658aec238c4ae8770a3c2f171077abfa12122f940c04258aa45d1
+MISC ChangeLog 673 RMD160 ce398df7472b1e00ed803e2333296fa0f1b54a01 SHA1 55802a1f401471212b1446cbe9e2551318f0ad82 SHA256 4749168b54431c71216b1be346ae6722d3aae7c8badc5ec1c091ca001144f9ec
+MISC metadata.xml 1752 RMD160 9e61890f3d34317fb0243f75c37a5d967f65d0c4 SHA1 3f5a9b5902c8aa7f06d260d750670e50ae264295 SHA256 f612c315aae33546be4c3294b9c61849c603f8576ff8869bb68cdcdd292f752c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO8bG9AAoJEIUJ+svaV163cQ8H/1afaAZIm4+SidhsoNAUXxdp
-QItNHELPIXV9e8QoXjPuIZxuF5Uj9GEXe9XsY/X0NwGQwsLvQHyENt7ZbWi9evcw
-P/aGs96mUaWeDy3yx77PiGzF4h6nvZ9UigNEIEsfgQ85FlW2wHxxyVlgnKQqGpc3
-iNoJhAHM2grS9C62xqNf+7mUlGcg3RgKsxcrSHbWWlXR5Z20RRtXB+jU2Z8Fn0yd
-xqxO+0AH6QWaepOTSE8HPYSeCuvHs/nx7J21Ir1dvCpbyCXhyUt/BQDbCKurnZT7
-wdygNCq/gDXiB5PSwhAyMFaXGDqbxLnrlEBuLeozvIfl5OwiqAeICEp6rvLJz2c=
-=61pL
+iQEcBAEBAgAGBQJPL3frAAoJEIUJ+svaV1633LcH/ieOT1cgT/1EXFhQq9Niiuxh
+PSt0C9X5gPlJ4JQ9FzbhVvRuw9j6uyFg97Fkw1oe1vew5ngj21T2ICqvT7a3eud2
+kYum5UgWU2j//jfhJ+fFMCLbvv47i+fZ/vaCHXcmyUpjZJejZa+rKvPuO7VWN7st
+cnNpT1XOlzityNGmorkNxE0DUwcMiMeUop1IRqZsZG5lnYM8oh2isVtEyqekcy4M
+zdC5zvKynq541LAGbr3S1p7PzOX0gpsLAcpRXmzQnC0LP4iwEfDEYIPsZ0agCjrI
+Da47hPosysj87Q7tAdpoaErTg+e8zgjm5r7khjmOWhAaQUFnNqVt2nc9W2qUGwo=
+=UXbm
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
new file mode 100644
index 000000000000..804692510847
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
@@ -0,0 +1,143 @@
+Author: Ralph Sennhaser <sera@gentoo.org>
+
+The idea is to apply the pax markings before using a freshly built jdk. Be it
+for running tests or building additonal vms or after bootstrap to build the
+final jdk.
+
+There are currently two types of pax markings with the userspace utilities
+chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A
+third type based on xattrs is in development.
+
+diff --git a/Makefile.am b/Makefile.am
+index 82ef261..e17fa5f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -421,7 +421,7 @@ else
+ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+-if HAS_PAX
++if WITH_PAX
+ ICEDTEA_PATCHES += patches/no-test_gamma.patch
+ endif
+ 
+@@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
+ endif
+ endif
+ 
+-if !HAS_PAX
++if !WITH_PAX
+ ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
+ endif
+ 
+@@ -1359,6 +1359,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
+ 	  $(ICEDTEA_ENV) \
+ 	  -C openjdk \
+ 	  $(ICEDTEA_BUILD_TARGET)
++	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
+ 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+@@ -1586,6 +1587,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+ 	  $(ICEDTEA_ENV_ECJ) \
+ 	  -C openjdk-ecj/ \
+ 	  $(ICEDTEA_BUILD_TARGET)
++	$(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+ 	@echo "ecj-poured IcedTea is served:" \
+ 	  $(ECJ_BUILD_OUTPUT_DIR)
+ 	mkdir -p stamps
+diff --git a/acinclude.m4 b/acinclude.m4
+index 503131c..e80b209 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1677,3 +1677,49 @@ AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes")
+ AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes")
+ AC_PROVIDE([$0])dnl
+ ])
++
++AC_DEFUN_ONCE([IT_WITH_PAX],
++[
++  AC_MSG_CHECKING([for pax utility to use])
++  AC_ARG_WITH([pax],
++              [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
++  [
++    PAX_COMMAND=${withval}
++    if test "x${PAX_COMMAND}" = "xno"; then
++      PAX_COMMAND="not specified"
++    fi
++  ],
++  [ 
++    PAX_COMMAND="not specified"
++  ])
++  case "x${PAX_COMMAND}" in
++    xchpax)
++      case "${host_cpu}" in
++        i?86)
++          PAX_COMMAND_ARGS="-msp"
++          ;;
++        *)
++          PAX_COMMAND_ARGS="-m"
++          ;;
++      esac
++      ;;
++    xpaxctl)
++      case "${host_cpu}" in
++        i?86)
++          PAX_COMMAND_ARGS="-msp"
++          ;;
++        *)
++          PAX_COMMAND_ARGS="-m"
++          ;;
++      esac
++      ;;
++    *)
++      PAX_COMMAND="not specified"
++      PAX_COMMAND_ARGS="not specified"
++      ;;
++  esac
++  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
++  AC_MSG_RESULT(${PAX_COMMAND})
++  AC_SUBST(PAX_COMMAND)
++  AC_SUBST(PAX_COMMAND_ARGS)
++])
+diff --git a/configure.ac b/configure.ac
+index 580840e..f37ef68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,6 @@ IT_CHECK_GCC_VERSION
+ IT_CHECK_NUMBER_OF_PARALLEL_JOBS
+ IT_CP_SUPPORTS_REFLINK
+ IT_CAN_HARDLINK_TO_SOURCE_TREE
+-IT_CHECK_FOR_PAX
+ IT_LOCATE_NSS
+ 
+ # Use xvfb-run if found to run gui tests (check-jdk).
+@@ -189,6 +188,9 @@ IT_WITH_TZDATA_DIR
+ IT_GETDTDTYPE_CHECK
+ IT_JAVAH
+ 
++IT_WITH_PAX
++AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
++
+ dnl pkgconfig cannot be used to find these headers and libraries.
+ AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
+ 	,[AC_MSG_ERROR("CUPS headers were not found -
+diff --git a/pax-mark-vm.in b/pax-mark-vm.in
+new file mode 100644
+index 0000000..bdff735
+--- /dev/null
++++ b/pax-mark-vm.in
+@@ -0,0 +1,13 @@
++#!/bin/sh
++
++# Taken from Gentoo's pax-utils.eclass
++list_paxables() {
++       file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
++}
++
++if test "@PAX_COMMAND@" != "not specified"; then
++       for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
++               echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
++               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
++       done
++fi
diff --git a/dev-java/icedtea/icedtea-6.1.10.5.ebuild b/dev-java/icedtea/icedtea-6.1.10.5.ebuild
new file mode 100644
index 000000000000..9fe8de1f1dd4
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.10.5.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $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 $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+OPENJDK_BUILD="22"
+OPENJDK_DATE="28_feb_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_01.zip"
+JAXWS_TARBALL="jdk6-jaxws-b20.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
+CACAO_TARBALL="c7bf150bfa46.tar.gz" # 17 Mar 2011
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+	hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
+	!amd64? ( !sparc? ( !x86? (
+		http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	) ) )"
+
+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"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cjk +cups debug doc examples +hs20 javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.7.1-r2 and later properly respect environment variables.
+# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.7.1-r2
+	dev-java/ant-nodeps
+	>=dev-java/xalan-2.7.0:0
+	>=dev-java/xerces-2.9.1:2
+	dev-lang/perl
+	dev-libs/openssl
+	dev-util/pkgconfig
+	sys-apps/lsb-release
+	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
+	${X_DEPEND}
+	jbootstrap? (
+		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
+	)
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-6"
+	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-bin-6"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	else
+		die "Unable to find a supported VM for building"
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	eautoreconf
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
+		use jbootstrap && bootstrap=yes
+	elif has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
+		bootstrap=yes
+	else
+		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
+		die "Install a GNU Classpath JDK (gcj-jdk)"
+	fi
+
+	if [[ ${bootstrap} ]]; then
+		config="${config} --enable-bootstrap"
+
+		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		# Don't use eclipse-ecj-3.7 #392587
+		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
+		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
+		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
+			ecj_jar="${ecj_jar%/lib/ecj.jar}"
+			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
+			ewarn "Found usable: ${ecj_all[@]##*/}"
+			ewarn "using ${ecj_all##*/} instead"
+			ecj_jar="${ecj_all}"/lib/ecj.jar
+		fi
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	else
+		config="${config} --disable-bootstrap"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	if use hs20 ; then
+		config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# ant -diagnostics in Ant 1.8.0 fails without xerces-2 and xalan
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="xerces-2 xalan ant-nodeps"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake -j1 check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS THANKYOU
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/icedtea-6.1.11.ebuild b/dev-java/icedtea/icedtea-6.1.11.ebuild
new file mode 100644
index 000000000000..0c735d21b562
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.11.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.ebuild,v 1.1 2012/02/06 06:49:00 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+OPENJDK_BUILD="24"
+OPENJDK_DATE="14_nov_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_03.zip"
+JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+CACAO_TARBALL="cff92704c4e0.tar.gz"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+	!amd64? ( !sparc? ( !x86? (
+		http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	) ) )"
+
+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"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	dev-util/pkgconfig
+	sys-apps/lsb-release
+	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
+	${X_DEPEND}
+	jbootstrap? (
+		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
+	)
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-6"
+	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-bin-6"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	else
+		die "Unable to find a supported VM for building"
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	eautoreconf
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
+		use jbootstrap && bootstrap=yes
+	elif has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
+		bootstrap=yes
+	else
+		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
+		die "Install a GNU Classpath JDK (gcj-jdk)"
+	fi
+
+	if [[ ${bootstrap} ]]; then
+		config="${config} --enable-bootstrap"
+
+		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		# Don't use eclipse-ecj-3.7 #392587
+		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
+		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
+		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
+			ecj_jar="${ecj_jar%/lib/ecj.jar}"
+			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
+			ewarn "Found usable: ${ecj_all[@]##*/}"
+			ewarn "using ${ecj_all##*/} instead"
+			ecj_jar="${ecj_all}"/lib/ecj.jar
+		fi
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	else
+		config="${config} --disable-bootstrap"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake -j1 check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS THANKYOU
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 678065f4c387..f872adbcc3b8 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -14,17 +14,19 @@
 </maintainer>
 <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>
 <use>
+  <flag name="X">Make X buildtime-only depenency.</flag>
+  <flag name="alsa">Make alsa buildtime-only dependency.</flag>
   <flag name="cacao">Build additionally the CACAO virtual machine.</flag>
+  <flag name="cups">Make CUPS build-only dependency.</flag>
   <flag name="hs20">Use the new version of HotSpot (20).</flag>
   <flag name="jamvm">Build additionally the JamVM virtual machine.</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
   <flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
-<!--  <flag name="shark">Enable Shark JIT support</flag> -->
+  <flag name="pax_kernel">For building when running a PaX enabled kernel.</flag>
   <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>
   <flag name="webstart">Enable Web Start support (via NetX).</flag>
   <flag name="xrender">Enable support for using XRender with the AWT libraries.</flag>
-  <flag name="zero">Enable the zero assembler port of HotSpot.</flag>
 </use>
 </pkgmetadata>