dev-java/icedtea: Version bump to 7.2.6.8 wrt security bug #600224

Package-Manager: portage-2.3.2

2 files changed, 396 insertions, 0 deletions

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index ed4c6ea5be7a..75a49cf17e6e 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,19 @@
+DIST icedtea-2.6-corba-9e002eaf26ed.tar.bz2 1072838 SHA256 2f728daac0ca88e7097a223f8c1ceaff8b4597e4622c5e365931edb25aa04538 SHA512 b306a562b999c7e221c2535d5ef575f835a0e1fbbc6fab331cfa3ae016c048d6d7f822786a270e61958c9590395ae360af0f8069beaa123c00be1592487c37dd WHIRLPOOL 6a1428c051a1febf07c5fd48a5f401d9ca0f4dd98902deb149b01e202e73d69007d008fae9c565f23562ed8ee38772bb2f9adc0af056e4a1c7ce789625de57de
 DIST icedtea-2.6-corba-e5578d3bc593.tar.bz2 1072909 SHA256 0049439ea08f8391c0dae464ceb249f0af9d8e70c68142a734ceb25fa145e764 SHA512 735553ba107df875b61bea38735309ddd1d99cdce989826eaae3587efb10b2a99a3ec1bd749574d17bf502dd7cdcb12436a1a7d608fa1b44b8bbb79b603d8dfc WHIRLPOOL 441d51e2f1e3114b3a06dda7c9545b08e1d9b2e38cc431acfe67a2111e261a69fd0a993322acfff82d48882154e9c5ced62ac444609e383c142270df661bdcee
+DIST icedtea-2.6-hotspot-223f6c442d49.tar.bz2 8191191 SHA256 ca55f548f3169ba9bb6ca81265900722150953ee19b19606e4bf8e6dd50d7194 SHA512 e197a9e4e302d1b823eb4905ff58f2559d4d180e68deb7b9ec013ba41f155fb42b312f9f55315c67adfad632f37a01ee2f295d40f7c2b08dae07fc4aa8d509eb WHIRLPOOL e6fb07cbf9e144b0fb4464efea38152fcb2a1c1ff6b1bd77d4ce1da2ed289a9663c673be0fee80d3418b57547741d86317ec82fbd9852a341058b9fdd4377c30
 DIST icedtea-2.6-hotspot-75297b84957e.tar.bz2 8187345 SHA256 0412594f4dabd77a759957bba038aedf277dee87d06153505fb63919c0cb6a5c SHA512 9dc53d5f9bff967dffb994779621464540b94239a209d75482a6529d4b284bf40469ca180ada1a20cdede894d5b5d1297946db5d7ba5fc7d875c33b2d3559a02 WHIRLPOOL 94c88990aa9cc720781a6e141e3816c00d381dbbc0acb780b3496800b492c4e8d37f58b683ca02cf8b357d1d1185f9bf3acec4f8d64ac9b575b5e434ec656313
+DIST icedtea-2.6-jaxp-3369fa5a875b.tar.bz2 2733402 SHA256 ba1ba48e9ad9ee36df344e6e283f0f7a9f8aa9cee223c8ea2f2ee711092091fc SHA512 6b865927f97f6fcb709790f9a53917241c00f7d1123b5a5babf6752bdb1fe3c01aa8cca5dea40b5b64ad2d5ef8cdbac80ff7f9f32e736a9f71283e3eaf1a7e99 WHIRLPOOL 42dccb729503b9af5ba464be221a9604ca2daec1db6bba17ae2fae607c3a9bfdf6a487af3c79c8b8b30d816f733636331cd847ae4c3081aaa24cfa1a2a7fb9d2
 DIST icedtea-2.6-jaxp-b643540c673d.tar.bz2 2734041 SHA256 9fbd60855406879b898843d7eeac2a5df64b0ccdeb927c615c5be648b8fac70b SHA512 2483561e7ad0f6e201740689dffc097419d53640d394883026ec216b7ecacafb5f1952b12e5229fd5a6cd9174388fb45105bebcf80cefd7feb592b33e2f65b24 WHIRLPOOL 9e9982fbb16b5b490047569969cc757a8bec77480358254a2a9e44d4049adea11ba975cc5a63021c84ead4f8091c1cdb578c29a9915e7c4770d27aed192363f9
+DIST icedtea-2.6-jaxws-26bcf28b3a60.tar.bz2 2022420 SHA256 753093e71ac609b9350bf16daf230fdc2f873cd573428883448098e39e4c041a SHA512 a555c192377da223fef4f31a64296e71237389126db0777f9d64d086e026ecddb7d529d6330cb09097b726246ff880bf3597769ab695249d93fc7f2e14e9affe WHIRLPOOL 869d5245443bd9f737cca91af861a5a27bd6071f73bd2da0b5af91a1ccd20beff1fdbef48bd705473da07be35b4e36bc673e67af4eb53484a40cd71ede159533
 DIST icedtea-2.6-jaxws-4a99f4eac257.tar.bz2 2021978 SHA256 c9fcc1553bbb4fe1dd5ae4616b6a1f52f42c2bb990fd1cbdafeac43bfd6b30f7 SHA512 e9c65a65dc61bdbc56bf7f0ff7945abfdff95551c0484fb031a29a540a692f11309916c76f2d8717f88a3d93fc59f6a97aa21d24231668f6d49c3afbc403bad1 WHIRLPOOL e78095f6cff39e66d01a6d37093cc5891f8785c2d5a80693d9dc4ff2bf4eba23697082cb3124e9767864ec4e341d3caab0d488583f319e40a3fc3b69d2bc636a
+DIST icedtea-2.6-jdk-52225839bbea.tar.bz2 32770146 SHA256 ec1118f52eb208a529e99ec1a64351b737bc0f892e05f0ffd4327b4be533e761 SHA512 68c401f90496861852a3531de8f0f5f2d1951e8a6aef7566bdbb98a06e32d9ea0bc263b05a03d4558f96afb37687f69131d371b28f23a6106e5937875f50f281 WHIRLPOOL 64d086bab0a3a6aa2e6afce36fe6c467990c1e2a5edc0e5a2b44f850d0f9c04b791ce1cca9436c40421ebd576694597d430ace24f9fd98bd6b06fd16a6bdb847
 DIST icedtea-2.6-jdk-8b6b930489cb.tar.bz2 32719530 SHA256 e93cd330b2346bc6145bb76a141233aa1cc083eb25bbc82819632e1581290d81 SHA512 ac07270f88f6b1359224d665ad8e0c44d3a50fec186e9ee5291885d5574f0c77d3c2660583d2b09b21945213ace25dcdb45f72e2738794721901c22d740ca110 WHIRLPOOL 2b46907839088f32e1f2938ad730998010b0514adf5e5564b0eb756ee3a02e7f7f93c155a4ac72c17f6fee77ccecccbfdd2769b48ced2ac130da0ea150215f7e
+DIST icedtea-2.6-langtools-545e512eb4de.tar.bz2 1707805 SHA256 004ec63ebdd0b6182c2bde3e190bb745a0d932ad7b05901a4376a04f06158813 SHA512 c745318b9c1b24e77a2a2ce80fc20a15d92c82f91c914bb17fdbd025d8b525adc2619dcc44c2c3394e5204eb7d13e0d3f4c115fe0f548674c3e45f859e2abcba WHIRLPOOL b52c5862172c169ac0081f3e86212a049105ccd60290dd063c2d777d5a47de82002c01daa4db549c5aec79d869605c911f72d6190e46f79fb4e8b50dc7ddd8b2
 DIST icedtea-2.6-langtools-ca9d8b242a10.tar.bz2 1706461 SHA256 13e700318ed4a00bc85890525a1fe16b7ff4798ad9e49acdf730b6dfe1a6b4e4 SHA512 d26044cbd0104d27449c84bc24a687809c67a48926a23de5e155600f456a0a35514571304b38b63017d81d1c61991908e1d10cb60616dc16f9ba4635f3adad4c WHIRLPOOL f63867b325d29382e69f2969eba7d102038fa4d1457b112832bca087867577c27fd8f6c9d51ca5d2302f98ea6899f41e8f7e03510d648d5e2a9e93bf58711330
+DIST icedtea-2.6-openjdk-653c2662034d.tar.bz2 130319 SHA256 e6bea22acb9e89e200fdc2a4a7a04ecee042f3ea9f9a49bab739fdd2598e4ce3 SHA512 7f5076df16dafabe556c64ddfa51a684ba62f85dadf750d22d2a4abd2766073e1a67f1705bf2c6bbc6fdf2559ac3cc9a83658a23a6e541aa3bd605ce8e44cf8b WHIRLPOOL 4a4dfd31c2a9b969082db38540458043d9eb2f7884297c2ba50d19ff96a7ef97748f3beeb444879fc9abf4cb363b5d1ba64e37dab38794a77f4b68b6e972bbe6
 DIST icedtea-2.6-openjdk-6aafb6fe0a1e.tar.bz2 130221 SHA256 5cacafbe543ad4b9179ab1cbfdb7d9baf8aa04d954510b9e7baf0bfef7db6878 SHA512 819acf776e423bb5bcb8682967ac0fb3fcc37da4ada618d5da186d052d6958611f537799c7cec0ceb57fbf677727840dbf8cd569d9f2226693c6551586de2ae4 WHIRLPOOL c3ca72d11b095bcf51127bf88ab439879604045bbfc316b24290d8580c2c5f27d225898961b65203c5c79598d6e6c43f173c8de7473f64aea75dd06ffe296801
 DIST icedtea-2.6.7.tar.xz 2085824 SHA256 d0922d6ecffca8e246a0b60db6e1d0c5ff924a8d5a86362991e2d4269d0a9ee4 SHA512 85b6bf9e72e200ae9f26b4b2e8a35af6907fdb85463073cf08fc4394d9364586c3eb1042ba83a39e13e6924aac28d3f6ad5dee906b49a5b1338f20f34a63abc1 WHIRLPOOL 087dfe9dc1815e91d1eb9c697845e09f36fb3081371534b9a15d37aa93a3a2dc00506caeb7202f64d04fc7f103a7965a21ad159040862c2666d450ccb0982626
+DIST icedtea-2.6.8.tar.xz 2092212 SHA256 854030ff1b580d896dbabbdb0e64dc0ef3537786285808a7b3cdfcb80520255d SHA512 3f3d1b30cb867959bc651df76c6a2c06dfabb320e1ca96db9bce072b1758b070e9920918ebd00d3865cb4f9dee95a25c305db4224fb05f4fd047a49ffd2ee269 WHIRLPOOL 9af32f6e5c2bdf6ceb899fcaa7dd9f0d973cee82ba7e7f89bef9acb6d8a5b95d1886932751c2beef8aa38eb8e1939da33a8e0ecf77bb273ea5a5c763b4fa7761
 DIST icedtea-3.2-corba-9d3757e6da35.tar.xz 939832 SHA256 902607987e26c67489f01fe8cf693fbbbd5850f3b9b06ff12af5486b75822387 SHA512 b66f13f3f65085857bbdfb37d4d05a872a4cdb115394787365c8b4f67a70b95df4c66702b930fb6ec637e9f5065e21283df344127d618477d3e1beca7b9d047a WHIRLPOOL d5b5e96f55e9f0d61eaec4f22e4006bfd2a75ad89e603bb60fc74af8b05e19ab70dfabb05c30a8919b980857a1ba7631d0d322ee0b000af5352f6409af9e3dd1
 DIST icedtea-3.2-hotspot-be4aeaa327f7.tar.xz 6809636 SHA256 9dd74ff7ac16b6104410c7c331f39e96fe50940e4023201b1a2898a8314e1fbf SHA512 69df8dc706900d07eca71982de27c55c9cde18c41061752e91108c30cd85d0d9b37f8b9e041aab0622746510900173bb635cdc4cc3c4fd0f795898fc15158441 WHIRLPOOL 09077c8c10dbc90585df60ae785411ac4dcc14f3955cce52fd1aea5b6c24cf3ee07ffb865275f239f52d04aa5553b63fcbf4f889b312a6cd41e98cab3d946925
 DIST icedtea-3.2-jaxp-81c2773fbb0d.tar.xz 2301272 SHA256 61d6c7a44746ace38812582474b66c2c96f1ce9c7bd5b9ad251b4d5982bee6d6 SHA512 44c0c43509a5c7e7f95ff319a857019acfc1645cadc584e5a20bbc4df2ba154f1d6ed85f9e6154f5526800dcc997971b53762040c2392f4edafe85c55e05721a WHIRLPOOL 77f887aabea7347232cc1c18acbb15ebfe5134e731970c112be6bae97ec1fe6bfa074d26e03eada7c3ad5bc2e2902141684f042034ae6954fb8b7a562439ea9a
diff --git a/dev-java/icedtea/icedtea-7.2.6.8.ebuild b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
new file mode 100644
index 000000000000..db17d9d0e3c7
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="9e002eaf26ed.tar.bz2"
+JAXP_TARBALL="3369fa5a875b.tar.bz2"
+JAXWS_TARBALL="26bcf28b3a60.tar.bz2"
+JDK_TARBALL="52225839bbea.tar.bz2"
+LANGTOOLS_TARBALL="545e512eb4de.tar.bz2"
+OPENJDK_TARBALL="653c2662034d.tar.bz2"
+HOTSPOT_TARBALL="223f6c442d49.tar.bz2"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_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"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
+	jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
+	pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# 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="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
+	>=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/libXt
+	x11-libs/libXcomposite"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	app-misc/mime-types
+	>=dev-libs/glib-2.26:2
+	>=dev-util/systemtap-1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=[infinality?]
+	>=media-libs/lcms-2.5
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8:=
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2=
+		>=x11-libs/pango-1.24.5
+	)
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( ${CUPS_COMMON_DEP} )
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# 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
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		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.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
+	sys-apps/attr
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7
+		icedtea-6 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 ${SRC_PKG}
+}
+
+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"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if use ppc; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-downloading --disable-Werror --disable-tests \
+		--enable-system-lcms --enable-system-jpeg \
+		--enable-system-zlib --disable-systemtap-tests \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable !debug optimizations) \
+		$(use_enable cups system-cups) \
+		$(use_enable doc docs) \
+		$(use_enable gtk system-gtk) \
+		$(use_enable infinality) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# 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
+
+	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+	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
+
+	gnome2_icon_savelist;
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }