Version bump.

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

4 files changed, 384 insertions, 9 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 8d0367dcc553..a88b4e2149c5 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.73 2012/05/14 16:27:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.74 2012/06/10 13:56:19 sera Exp $
+
+*icedtea-7.2.2 (10 Jun 2012)
+
+  10 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-7.2.2.ebuild,
+  +files/icedtea-7.2.2-no_suffix.patch:
+  Version bump.
 
 *icedtea-6.1.11.2 (14 May 2012)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index c74b405e7b99..007be3f5d225 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -7,26 +7,35 @@ AUX icedtea-6.1.11.1-cacao_jvm.cfg.patch 5157 RMD160 37035f173e95b407896379f466d
 AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
 AUX icedtea-7.2.0-explicit-gthread.patch 696 RMD160 cda560809998da7925be2da896b34ba60f46b835 SHA1 8764b20bd736ac6c8ca7a061d48b1faac57ee26e SHA256 78e55b212004127726c8f0ab02b8a0a1c01677443237505a21fb803b38e08c55
 AUX icedtea-7.2.0_pax_kernel_support.patch 6511 RMD160 ca6ff5d7f8c1157558af28ef631ed4fd5f67f901 SHA1 538bb29bc10978ae14114cfed525c3905e808984 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e
+AUX icedtea-7.2.2-no_suffix.patch 833 RMD160 d3d7b659c9b4de33d8b90cfd82d291d489b2feea SHA1 0b0aa2755d4aaf350d33a5a405974a1e5763dbe8 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8
 AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
+DIST 0036fe6fe7dc.tar.gz 3971078 RMD160 d7a3e888cf52fa028c52d503eb6e23637b5ca50c SHA1 bebb3c056e314e650838f1a221782eb8ace8f850 SHA256 245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2
 DIST 0e651e004747.tar.gz 8994812 RMD160 5101219f10cd0e1f61a37169472f0662876420af SHA1 fe21eabdcb334456907df772a269a21fee8f3c19 SHA256 d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1
 DIST 1107cfa36f53.tar.gz 2760046 RMD160 d683e012495187b44190f2f3018f2ea9aad3d26e SHA1 341d29940978d27fc0e79741b165844e02fc952f SHA256 f3f00583484532634b400fd49b544da19426f476311cb4338389e0b669dbe18b
 DIST 1cf75c0e2c96.tar.gz 3985855 RMD160 6f6744e49ba87e4d6f1fe3e1533fa2e6122ed74f SHA1 813a9980e74c24395c20b33c14624ffc4f517b35 SHA256 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e
 DIST 22cc03983e20.tar.gz 129111 RMD160 d4635d4dcf6396b702fcb994c32da57dff1abb6d SHA1 72934269193ca7506b56ff5918d5b39436d883ce SHA256 ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7
+DIST 3231f3e9c517.tar.gz 1449514 RMD160 67c3a7d6b2a6cc3c817ea99c034faaa94231c156 SHA1 32460bc09f7eaad3705fad5550eec0e855a9d07f SHA256 9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274
+DIST 49a6fc8f712f.tar.gz 128837 RMD160 a34f192a80fec9cd4bca28032617c1c65c7e1eb7 SHA1 ad51a998b2c0dba82c147081911a9e637fc5d73b SHA256 26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54
 DIST 4b063ca7483f.tar.gz 128605 RMD160 e33275719b7bbe814775d3308ad708ba051aaf24 SHA1 e3edd429731ea8506aacf2be02c0f403a4b0cfdd SHA256 095e1d10bc3733f2ff9c7268690395f86f27203bedf7b1ad5e7c9462e9c56027
 DIST 50f6f276a06c.tar.gz 43434230 RMD160 6e6794f2138659f2aff7997a98c7a6e84f80285e SHA1 37cacde8b1028c38e041218b2c39ce83224c9e5f SHA256 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d
 DIST 5617f6c5cc94.tar.gz 1447230 RMD160 2c387ab1711a3d43d2ed04415229fe9f82af366d SHA1 7a068200bada7e30ed9540bb835f8928800a3b28 SHA256 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3
 DIST 7edfbfe974f2.tar.gz 2760671 RMD160 538c758fedb47e790367311d04cff6d03e549e8a SHA1 02f18a80d6940a8203b361ba848dabf97685266f SHA256 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa
+DIST 839d0155f7cc.tar.gz 44793871 RMD160 8a96e72b419fd7f1e6e9ea05502beb051210c4a6 SHA1 65f59bbdbc2be4c1683291e0ebd8f494713172a0 SHA256 19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7
 DIST 891fb0050add.tar.gz 43376045 RMD160 5d5515401cb19d02f3b626ddbd1fdcd021dd10a1 SHA1 939e5e06e97e9219f3ea67777f2b889d8150a489 SHA256 0126669a71600514b7a2af5235e43dbebb33dc76090ec5e3c59ed62e52c05e51
 DIST 9dfaed4a95e2.tar.gz 8999539 RMD160 ee349541c0af68f0650daf7a170e483ce157a1ca SHA1 ff33c860252c5812451beb9010e48f838e784815 SHA256 0c7a8fde149ab146bd349045d20b6e615c8e811b5c0ab9b3b7a82ce621c91c8b
+DIST abfb890c262a.tar.gz 2761760 RMD160 a6841865af69849feac6df27a486daeaa92b9e91 SHA1 8029e6672f60650d869c0c9c01d1e1a06aa5ca3f SHA256 e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a
 DIST ae891cd6ba73.tar.gz 3985868 RMD160 b71a4a16747544dffcfce2c2858ad22b042562c4 SHA1 888a39202099528925ca81b70474a18ca838ccea SHA256 826fee2432a4e3ad45f348501f1d001f34d004ac36b5e010b5d13433b80d282f
 DIST b534c4c6cd9b.tar.gz 2291346 RMD160 579be2a657a41e26db4371170b52cfbb1f8f3980 SHA1 4d35855d261417bb3ef1363ad7e86621f4a22529 SHA256 c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c
+DIST bfe5efd70bce.tar.gz 9363244 RMD160 8f975424f04952baa6581581945a55951e6e3cb1 SHA1 aacf9af40d5eb4fbbb599988a9caf912ae66f648 SHA256 86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514
 DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee
 DIST cff92704c4e0.tar.gz 4261719 RMD160 cf01828a98a6e3139ce33761b2b0f87b0ee6ad48 SHA1 043845bfc67f58e30ee68d9a47f33385ab67702b SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f
 DIST d37539e7e838.tar.gz 1446780 RMD160 7db6d74d37482428695b342b145eb3997adaf96c SHA1 235bc423864566f12cca85fed0bd436c4588d67b SHA256 6eee28912eea59f64ae05d56303e1027a1684c082d025635b8b3aef01b5c7b0a
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST f0faea84413f.tar.gz 2276373 RMD160 8a617a58d9e47ab6f5d239449dbbe3666718e29c SHA1 24fc201a2373d8d4443a0e00d811abd64cdbaa31 SHA256 82cf48bd87dd4da3c1c1dc383605aef0121106880a6d3dcb923572661117087c
+DIST f855bdb37537.tar.gz 2303970 RMD160 365e7ff25e433fdd01b255b2fbcf192a0a516e40 SHA1 f9b758cbb6a45b2cec47379391f765a01af7ae8f SHA256 d46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19
 DIST icedtea-2.0.1.tar.gz 4516686 RMD160 1689c4a1106db57514804a67d3dbc2fbcf19efda SHA1 b81e07b1eefe58e88b9e67b1b36de1750e156144 SHA256 9d3c4d3676c2286003cf9beb9fc3ee442d2c04b3f8b229be140fe636c9e70101
 DIST icedtea-2.1.tar.gz 4687722 RMD160 94de5eb942e3ee68dbfcb6d9f6b7992f462e473f SHA1 707fc67bb404e38d36f877bf59055950f3e26066 SHA256 8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6
+DIST icedtea-2.2.tar.gz 4749395 RMD160 a5f35fb52302ca2730fc73c9e9debd3a3529fd8c SHA1 996ee8f80675eabdb67533b220eddc0b523a7d78 SHA256 98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5
 DIST icedtea6-1.10.6.tar.gz 6844249 RMD160 4d2c3943071e5e444afcc9e833b42fd3f17d5a07 SHA1 4833760551c8eac347df96676996834c918e1554 SHA256 4bdd8ff2e6a93455425eeabd6c073137bf3816ad16ce6e89979ec1521e03c7f1
 DIST icedtea6-1.11.1.tar.gz 6344427 RMD160 fdcaba8fced7ecd30b17ca351424610e254ff735 SHA1 24c8a6e3f641b626349b8d199880b0a79213a814 SHA256 bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c
 DIST icedtea6-1.11.2.tar.gz 6387625 RMD160 299ce2b420e5e6a4e3fd4d59b06b7e0ecf414c26 SHA1 ba3f48aa1569babde049220b3b23bfc49b7f8e71 SHA256 078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5
@@ -44,16 +53,17 @@ EBUILD icedtea-6.1.11.1.ebuild 10081 RMD160 5147993a3fc1e6041db2fe2b47e703ddb743
 EBUILD icedtea-6.1.11.2.ebuild 9965 RMD160 7f6708399f88ef3f466771b51d3b5f2fdcfa4416 SHA1 24c82e8fb2e0466a61df24629f63d63bd3afe50f SHA256 33c05dcaa376bcd598eccd3d942f98b854d2c1e8d95c56629b8f282387729366
 EBUILD icedtea-7.2.0.1.ebuild 10626 RMD160 614163a25b86e1c8db0c884a9da722aced12d9f4 SHA1 bf08d1cfe78746a6937414a0418fb3f7ec7c2d43 SHA256 54de77141237937f30d6d89d28ad8c538ae4a93b7559669e8db27ea1f11d6ca7
 EBUILD icedtea-7.2.1.ebuild 10768 RMD160 fb68994569b8beae51acf3bf9c71a86ca3ddac17 SHA1 d3006641de4f5fc7371322d6b5cc28ef23667ea7 SHA256 8dce1934db92cf728673fcfb12462e1e2852c9e5209d286b3bb80d32f551c364
-MISC ChangeLog 15880 RMD160 72a2b6e4714d97e0fcd040fb674f50fde735d25a SHA1 83b87ea940bd2255c07f069160a423cde3b56b15 SHA256 f6235bf527c2f3ca8ba1eee5374b168d68d1cea3ff975ff63f78cfc31a315598
+EBUILD icedtea-7.2.2.ebuild 10670 RMD160 75b0c1de22c40de033fc9c9f36d4347c0819d3bf SHA1 76346be838c487595a21bb59ba0791f53c563397 SHA256 c05c67f616b5354f09d9aa43a254c15fd56db22dde9a7661d9d86e0a1eee7127
+MISC ChangeLog 16040 RMD160 2d70b54123231b4dd490a25f05efb4f81b2a17da SHA1 d60d8cbe66776b2eb0757f04e3ff6e8771b6874f SHA256 f9df64cbc7ce752f13aee366a9db1acc330209aced08edf964fc49d7cf5c1e9b
 MISC metadata.xml 1453 RMD160 bb30b34303c3e053daa495840f1934b48c5a0013 SHA1 4f37b16a61ba1a6561ae8cfbda83ccd7f7f9444f SHA256 a4ef5cb3d610bb00db36e324edbc1df3b7f4f2794c80c9cfb4304239497622fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsTJpAAoJEIUJ+svaV163zQkH+gNzob1zLqkmE11+xJi6q+Vv
-Cneral0brN8R0EEJ3YfM81kwUIjLkabg01KovA/wZJ9Nll/HApIcwjH7gYxQMP+h
-JBW4b4g1ZOxSo98hmXWODd0sB+0/cXIBAxr7gEGZtRCYotP/RpPiwfcTHrOb8XgX
-IvcPILZ+NmfW56LfPjAPELmM7spA2yYh1A2CPXJFWI94LcWXk7jGt2JoB4JInfXT
-2Ko8/AdKgMzCrUfhDZwh8wtHPYd+eYRxZnNKJ+SDTfIaQFjW4BtJrQGMGaWqBwAK
-IL0G9zLVEFG63EAjfwtmcl7Z8OPRsGmVONeT2yW5tkUhLTvmiUhbDmPwbxx1hbs=
-=IfNx
+iQEcBAEBAgAGBQJP1KeTAAoJEIUJ+svaV163IDMH/jEAZBJ7P4pKrziw176z7J7Y
+G2/ruQjgATqHuh06diXHQ1Y4CvW4ro+hWUpTw0k3Xpu1AWqsrr+KcBf4YoXWCWup
+OfvfU6q/u2yA7iQFQO2/9Gd0mU4dJ765Wz6F5GOjK5kwpJgKXTkCjfw8YyhE4cr6
+8qqb3/3Nb3YRpyekgtUcZq086PxnhCdZKIQX2mTEmwOW1JNxWuUKRLGu8oZ5yWiD
+9q1dwU+tDZ6aMtfvZTqOOZVLu0p1BIsbwotT9NnEbGkN/r24SsrYg1W9eM1CCy6K
+IwsyoWMzP1IBbh4CN7vv5YzflHFuhRHSbz8nSINSYjMnqWJ7syFivoW20t3gIMo=
+=Lzmf
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch b/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch
new file mode 100644
index 000000000000..61bbd09d84ee
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Andrew John Hughes <ahughes@redhat.com>
+# Date 1338297380 -3600
+# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
+# Parent  2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
+Don't add a suffix for building the default, IcedTea.
+
+2012-05-25  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(versioning): Don't add a suffix if building
+	the default project, 'icedtea'.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1435,7 +1435,7 @@
+ 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
+ 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
+ endif
+-	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
++	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
+ 	  proj_suffix="-$(PROJECT_NAME)"; \
+ 	fi ; \
+ 	if test x"$(VERSION_SUFFIX)" != "x"; then \
diff --git a/dev-java/icedtea/icedtea-7.2.2.ebuild b/dev-java/icedtea/icedtea-7.2.2.ebuild
new file mode 100644
index 000000000000..fc1b9a185e78
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.2.ebuild
@@ -0,0 +1,334 @@
+# 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-7.2.2.ebuild,v 1.1 2012/06/10 13:56:19 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+OPENJDK_TARBALL="49a6fc8f712f.tar.gz"
+CORBA_TARBALL="3231f3e9c517.tar.gz"
+HOTSPOT_TARBALL="bfe5efd70bce.tar.gz"
+JAXP_TARBALL="0036fe6fe7dc.tar.gz"
+JAXWS_TARBALL="abfb890c262a.tar.gz"
+JDK_TARBALL="839d0155f7cc.tar.gz"
+LANGTOOLS_TARBALL="f855bdb37537.tar.gz"
+JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}
+	!amd64? ( !sparc? ( !x86? (
+		http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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="7"
+KEYWORDS="~amd64 ~ia64 ~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/atk-1.30.0
+	>=dev-libs/glib-2.26
+	media-libs/fontconfig
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/cairo-1.8.8
+	x11-libs/gdk-pixbuf:2
+	>=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
+	>=x11-libs/pango-1.24.5"
+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/lcms:2
+	>=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 )"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			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
+# 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:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	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
+	virtual/pkgconfig
+	sys-apps/attr
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:7 )
+	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7 icedtea7
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${P}-no_suffix.patch
+	eautoreconf
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 icedtea-7 icedtea-bin-7 icedtea7
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use JamVM as it's the only possibility right now
+	if ! has "${ARCH}" amd64 sparc x86; then
+		config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading \
+		$(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 check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+	docompress -x /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
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# 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
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. 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
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 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
+}