[gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     b35d88b74004cf0aa00f0966201a078385b448a1
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 22:25:30 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 28 22:31:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35d88b7

dev-java/icedtea: Version bump to 7.2.6.10 wrt security bug #619458

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/icedtea/Manifest                |   8 +
 dev-java/icedtea/icedtea-7.2.6.10.ebuild | 387 +++++++++++++++++++++++++++++++
 2 files changed, 395 insertions(+)

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index fa6fbfc87d2..c47d6f24d08 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,10 +1,18 @@
+DIST icedtea-2.6-corba-4d807b58849e.tar.bz2 1073065 SHA256 2d173e14e89520106bec26696a520b643ae1eee4f615a05a0f44c40ca7f174ed SHA512 6a51c16e3f01fcf41c9f17bfcdc979dee81df1ce5dbe10601025c02046aa4f6794a55af88248ee850e5b0a9cf34514efc6f136f14af1dc8e92ea4fbd31fe010c WHIRLPOOL 8feffc4e25a87ff1c52590aeeac0b79788864035fc7a23f08906b8c181d577115b32d4017f47b62e390b3f5d33dea7b0df30d9e7c6991a753a1e7939227f356b
 DIST icedtea-2.6-corba-737fd3fbf139.tar.bz2 1073197 SHA256 48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989 SHA512 77e81659d3314172c2b80fb1441d268edc52e0ec0bd25f9a9596e3c7a545f0694a11cc2298952d72c85965529b344493d1f2c2187cf4d38749278018fc85a6b8 WHIRLPOOL be4c4dc243f5f79dc0fae1938040f67b276d1cb835a31c5e4587827da50fb4c81b5b89c90cb0170783b4ed81a57bdf9a4f5ae659b8197d80b66d717530fc7270
+DIST icedtea-2.6-hotspot-8edec8d2933a.tar.bz2 8201721 SHA256 ab2b144695d0dfcf342b569b3f4e8450b61c073a3b7c60870fc88cb6d66bd560 SHA512 4374e42caf921ddf3f05fe3e72422105ee41f4cb82048be6d7d6279b2ecee0923d0d97f9c70318fe03125708af276c525de3360eccaddf8bf81c6faf07fe5224 WHIRLPOOL a29e53b06e2a835ab9ea4373ac47a90ca3aec1c1aefdc273668ca9fe2181c55b005fd007dbf13a3d23a0a27fd2dbd67586ab94d838adbaf761ed7471d2763db7
 DIST icedtea-2.6-hotspot-9fc0d63c2a74.tar.bz2 8195300 SHA256 d4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a SHA512 9bd3b2fea69c9e7c27ad9e157a44a20c113acc41bb0c830f18395df61d919dea1cd6bb69f9849ca449be25a9244ccc7bf05a51b3c64521362b0d765bfd59fb32 WHIRLPOOL 4c7b688682aeafd7c1cd234428ef51c9ea3bcc44b0f77ba3a3f1d873510c1de2dfba430df94bafa7c6f990cc7e6e60c79e7b893b7f60599610d19a81fc7e6b79
+DIST icedtea-2.6-jaxp-4099d8cf255f.tar.bz2 2734164 SHA256 451df1bed6179be1cfb655623bb67ed0dfd551fdeeeec029ef8db74d8ca51f69 SHA512 fbb23c8370154f443ca503a9f130352b7a1b42bbae926b3abade7e9b379772a30352cc5d76d44722f80914dff450b3c0221751fad315746ee023087e17491f66 WHIRLPOOL bcef192f1f18a330ba3e05329341ecf2e0d66ceba6d0abd320c3b7ed43cd91f42cfa1368b3a87ee289ee3678e499b2c6d06c2dae25bb382712b8f9551de2faec
 DIST icedtea-2.6-jaxp-aa1c302a99fb.tar.bz2 2733907 SHA256 bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f SHA512 c1dd1b00d4f232ee8e3f365caa8502069bcf7cbda28e0900891ad9e63905a9bdeed00ae6e661148f181949494aae9bed6e2b0422711f24b2413c0bf484c08522 WHIRLPOOL 81289fe98950a8ce0832b2138870ee44883f3b1ac6ad20801244e39a85390c9074789920afd8ee7ffbb1fd5a7e6d61636cd00b2971657bc524d811822d6a6cc2
+DIST icedtea-2.6-jaxws-bc4f48c1ccba.tar.bz2 2022493 SHA256 765cb50d5afeaae0eb717b297e79472d1353d822e56cfc7e9e6845b49731cd57 SHA512 86e0a4c52ef92093e4d4a17f3e2a30764817cdc4285bc7ed4544efaff276a34404cb810a8e4d5aaea311c7942360aa844ffd1d4d32cf7eac9c7c53e075f3b34f WHIRLPOOL acf2563da5fe1102b7c5751ba52c4fe3536ae4683bbc0024bc5546e636f6c368a2a977f242a88b1c981b94a9f87ddc48196522d626a6b2cbdbc76826d6df0c84
 DIST icedtea-2.6-jaxws-ea96df8beff4.tar.bz2 2022538 SHA256 a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3 SHA512 3feea1a51d6e5d5e639eb482e6754525527f6aa307941470d012c31d26d0858f05bd9dcab39085260c916cb724920d9edf31522a3e85379e0d470c7fc0ea4e3b WHIRLPOOL 828e4c841e72578d48efca217946ce5fd8f6a8af2dd4076502587704e6a4241d63221921fed99584eafb5930ab44b88aa64c7d4cc904009db6226574f38d2f3e
+DIST icedtea-2.6-jdk-11e15e507828.tar.bz2 32873593 SHA256 50d0af5fd5008b6f4b07811c77c570d065584f8c1c70bafe016a6d10b6a36481 SHA512 5a8f1c50556379f4496135fc640370fc0e8a79537d0d3a2fe49bb118a2f52c2fba5ba4748b173ad813937678b58d906a959213f870a12ae184683f885f692a2e WHIRLPOOL 4ef15fd4b393733d91fbeecd9d2b668f0d3d2ff04009566bb64e04b3fd013e2c1bae82b4e7bf89a823c070cf07b850c91058ccc8953d0ae04a737e0f5b8bffff
 DIST icedtea-2.6-jdk-ce87b1399385.tar.bz2 32812887 SHA256 44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5 SHA512 9010fd923fa3eda72ff2e532e659dbd406c93043c2a40075e23d395ecee670c1b0a30bd68430fe1fd69a2f65d834e440c91596b5f6e9c29474eef31eca1f9753 WHIRLPOOL afe2a7bd7b13b0c840ca45b83f9c1987c18123af8a4d9767a5915838806a847208a856ce2b1643bf838e0e66bdb8d8a184404b874cdb49555cce46a4371e4458
+DIST icedtea-2.6-langtools-6e30439005f6.tar.bz2 1712174 SHA256 02d38317e85b7c10f0cc072c192467a504cf37a2a0d94cddc4347f5c56677653 SHA512 433d6c76aa89365363aeeafe3ba41c4965e75809e8c967cb9a484e8ef1d647e623f7117dc5694885e2d860ae0fa01b20afb0ffe11ae1f5996630c250f931e52d WHIRLPOOL 9556b1cf8487524e123648f65272c4a49d69050b0584378df90e17abda46eccf5122f9fcb2ce50e982350330f89e9e5576ea1517b290a3c4d84a4c3cf52358ce
 DIST icedtea-2.6-langtools-dd8e22d986c8.tar.bz2 1711235 SHA256 3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a SHA512 880924b19d3c021f137368eea51c380b0df8222c0148d8442b1b786d13a3698dc567d8783af1798a31364bdaa31b7580fcf02dfb82147a890407cd33c6a5595e WHIRLPOOL 77567688d4309adebea657edc61efc8c872e9bd148f9f3aeac739df590d4dc3bb90b827d3ae78fe9f027b6962af1902bef900f72a47f641206718cc354f6ccec
 DIST icedtea-2.6-openjdk-2dd04ef37829.tar.bz2 130401 SHA256 444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421 SHA512 67493785ec7aa3093f3d558a82e45c3f699bea63ccefacf273754b046d0a10b5cd19bb9a3dad7803a19e5d242ac06082729d1ac73088479db5712ccd08fdd223 WHIRLPOOL 04a9f53fa974792b4cc2279a6d7a5816a075246dfd863e99182c7e929173b0bb89d6aae68f2114637461148b45757716356bd14e096fb2b116f537b5479f66a8
+DIST icedtea-2.6-openjdk-b3f98f0d4549.tar.bz2 130493 SHA256 b0a9dd2e3c0b3a29d791e49c6e5ea63057380a8eb7574355d4c551986ed7740a SHA512 456ff472161347287812c7a281762f5d80d355dc1851b5887db10acf29a1960ccf2c4cf77d941dd3f92526ed1c327b7da1d2ca9c81adca62b886a92583e61417 WHIRLPOOL 28de0bbe710cd8c1048a869b7eb95fd6084b891b4a796050af9381178f32a010e4db508cabf92aa86d0148caf48536bde9f4de23e0bdd718be5f6b288816d0f6
+DIST icedtea-2.6.10.tar.xz 2106324 SHA256 1c49fd735cc908677044935b6899e59434356b7e65d163bb5033e32f6621a92a SHA512 3b16d5d7f690d96785f3f319964989781eae3668c822b52f9256134ddab4e59261aac187afe1994b74a1d3406d7c5aed40489a49d0a178134a5d9913cd2ea28d WHIRLPOOL e97838675972183d99ea4f6353f3de938c52c8a86116582f33faae54f031426a7feb8ffe129de05b05a55d705df564c2f74645f3ad9f01c4d39f0bc449a58191
 DIST icedtea-2.6.9.tar.xz 2107156 SHA256 8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea SHA512 6362e7329bdf5224d1c6340d4c03fe3ca6e5a879395c3af75390fcff9a8e8a599517a3f287d36110c301ba908e5bc4bcc8aa89cd605aa76f0e51f7a9aced6b3e WHIRLPOOL 5d4db9fc4fd73e9009a26fbbaab0891df13aa5ca7e1292bad5832833088d8bd2fac5593c705d64b1042204353bd9d7a23a7212257045dc36c0e6610e31629988
 DIST icedtea-3.4-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
 DIST icedtea-3.4-corba-22ed32f45405.tar.xz 941164 SHA256 47210b6c69dcc6193b9bf0a3d61b75b48f4fa56e8ca348e40200cfa14eca3fd1 SHA512 f0579608ab1342df231c4542dab1c40e648cda8e9780ea584fd47679b07c93508cbfa85f0406d8aa8b9d528fc5bd99c9d41469568fbec41a6456a13d914ac71c WHIRLPOOL cad62367e49620af521d8a7cfb46b2c9d9f0f7b4383b98ceacdc7bebe893afbf8072fb884cdf7cbbfc5dc269279c431cf9b65fd66f00daca1f40a867f0b18987

diff --git a/dev-java/icedtea/icedtea-7.2.6.10.ebuild b/dev-java/icedtea/icedtea-7.2.6.10.ebuild
new file mode 100644
index 00000000000..0143b078f50
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.6.10.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
+
+EAPI="6"
+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="4d807b58849e.tar.bz2"
+JAXP_TARBALL="4099d8cf255f.tar.bz2"
+JAXWS_TARBALL="bc4f48c1ccba.tar.bz2"
+JDK_TARBALL="11e15e507828.tar.bz2"
+LANGTOOLS_TARBALL="6e30439005f6.tar.bz2"
+OPENJDK_TARBALL="b3f98f0d4549.tar.bz2"
+HOTSPOT_TARBALL="8edec8d2933a.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 ~arm64 ~x86"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
+	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=
+	>=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}
+}
+
+src_configure() {
+	# 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"
+
+	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 \
+		--enable-improved-font-rendering \
+		$(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 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; }