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

[James Le Cuirot]

commit:     241aa4b3478ccdf7a688009fc49da7be70c1bbd4
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 15:13:33 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 17:52:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241aa4b3

dev-java/icedtea: Version bump to 3.6.0 wrt security bug #636522

Package-Manager: Portage-2.3.13, Repoman-2.3.2

 dev-java/icedtea/Manifest             |  11 +
 dev-java/icedtea/icedtea-3.6.0.ebuild | 422 ++++++++++++++++++++++++++++++++++
 2 files changed, 433 insertions(+)

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 54b3014fb36..b911f6f9af0 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -17,6 +17,17 @@ DIST icedtea-3.5-nashorn-bad6bd2d128e.tar.xz 2225708 SHA256 9e47a8838ff9f6aca596
 DIST icedtea-3.5-openjdk-80ab5dd98579.tar.xz 333312 SHA256 5834862d650ed290d88610d60abbfbb1f8bf47cd485051e1617ffee011cede28 SHA512 13ea05cdc90f18a1600c7771314fcf2d07bfef186e7fe9125cf37e4a62f51a1d26dab653ee294fd9079419b3297f812c6b9c516def11ede8355dd2f6d8e7a08a WHIRLPOOL 0fae338f860e1c78f835962716212020f56c50a0dc56fe3d68542f7aa34f0b33578c9d9feb7526d441734c56534aa555a87c8fa504025a839fe59c594c5bb821
 DIST icedtea-3.5-shenandoah-26bb4cd21d34.tar.xz 6928840 SHA256 71b862293bd17e96f5f1a57553c17ae32dca5b4586ba592118b7d16aee63547a SHA512 3cd1856a1dbcdfc7fac3293b7a8b449dc7632b797dab9b665cb9248bcb14f3bb635760f3eaebafbe3f662a24c5125dbb2572c525dbe5d02f02806ae6d8a2eaec WHIRLPOOL 1f4cdb1c068650f4c9fe1c8239cdb6a3fd668d67e8a740f6f088b9d8834bad13fbdcc485ba2e0b6d6049e3f820ee44e38b2da46889217a46f3954cc12ab36b82
 DIST icedtea-3.5.1.tar.xz 1492912 SHA256 8eaa6ac93d4a1989460109246f78427acc5493f847c7b2fc80d3a5d918d811c9 SHA512 2f9283606c275c1b326b39a649cedf0ff3a6b59be1ac455f44ced2fac16fba36758a63f227fa66c1f8ddf252a67540f6332fdf415f9dcbd09fe28308d1989cf6 WHIRLPOOL c6915b3ee3829da96dc890d28188b16e89269041309d8317a7dc17338791e16589ab72c0c0708a97dd492caf770dab2e5875703319993f5aede95078da4aee59
+DIST icedtea-3.6-aarch32-7b008fa0fb6d.tar.xz 6742092 SHA256 c20ed439e32c6d72321097289bf7ac19bfae172a90efe23e08c54e63c53b402c SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1 WHIRLPOOL 0ba359548f05f888d83534d0308a6bd7501ac6d95dc1f88338e8836959951a2bcea6f686785ffa4945049a345776d0a06dd03b6eebbee289b82df1da41a69be6
+DIST icedtea-3.6-corba-13a5a8a3c66f.tar.xz 938380 SHA256 ad9d8ee4124afa374fb362fc2cbbcbd9efae186ade413a539e36004e70603662 SHA512 5af5898c71e2f8b4feeb55d0976828ed89cc089048b64c5b8ffe55bc0db267e58c21bc6099737a50245352f6b1ccb510fbca3871c371bbc5109323c9a372e698 WHIRLPOOL 6cb3052a8dcf02781af9cc4cfe387f63c69c97f626bc2b2798a86b9c87d593f67d9cee844b2c17d2f2569c3d1b525e50184b0957d9a90f9e864d2bab02acc379
+DIST icedtea-3.6-hotspot-9bad7d4825fb.tar.xz 6820148 SHA256 2fd0b65c57255136b0fcf8ba0b5f5acdbb409af9c35ae4e84cfe7f93fdbfcfd5 SHA512 231775c3f7610388f2f5b11b60aed927e9f50cf0a65bf0675402b72c77ec1c4253e6151cbe0a27f9254297af024eae0f0ddd30a3d4b084699e730249202b9c51 WHIRLPOOL ceb043db7daec74e29b1f565da98baab7433b03ac97c960b3eb48e1b25eec532ae93c25cc280da1b44287a3213b5ccab8b2fa073d3684a40bc47c445a0f88ee5
+DIST icedtea-3.6-jaxp-947a7b1ce48b.tar.xz 2297468 SHA256 b1b7b78a1079153410c1a1d20c749f92660faceb25d7e51515731bf4c6cd5f1d SHA512 b557ef3a702ec2689578485d6a7444350aa6ce55b0eea6757996b52026e877861f6989a33b4b429dc56cbf7ff81c142696dac893552bdc7330213f45cbbea665 WHIRLPOOL d786592b1ca1d6e6b0bc31c4d6d966cf9bc8ed3e4a1f75ab4f85ceccb204a307883b330c7bb11891828a9cd806478405a684872164af951aa8b58c2c9e6ca77b
+DIST icedtea-3.6-jaxws-eafb356c44d0.tar.xz 2268316 SHA256 33fa2d3507498dd94d0313a2d8cd989ee1a56ef19d7203f01df79f82a1680e05 SHA512 2857819706bfad4b69e228a3cb4a139d094f605f1961dd739913015219cb38871f604b806aae4d584bc6e1b35b92406a7e9cf2b2afedee18cc4fdbfe14120f4d WHIRLPOOL 2a39b2cb4f832f09b5e6ebdb3d1d5a27bc8484e89ecfad8672a6e257a606eea0a1f145af59236275fa8510f76f47bf5e494c3bfde1a72522b5bd617c77c7e5d8
+DIST icedtea-3.6-jdk-a05e38417041.tar.xz 39075276 SHA256 e86575ce39c19b46f0ca9d0c6a807504f3eee092e8307aa7614cc8822742446f SHA512 7dcf19770ef989093a309efa6ac154482ed33ac6a72e61f1b646798bf55fdc5e81ce5333abeec01f25a8296a00ba34d8ff95f6de89155f92e8a52218faefb8e9 WHIRLPOOL 46a74746cfc8ed112ab68780a0e96d127853b955623ee804b8eb849b9d4156568565a1ac106c3e700f24ea027cb234b5b17d1afd2550f375876288f507f5c45f
+DIST icedtea-3.6-langtools-61a1c711f7ab.tar.xz 2065880 SHA256 2ced1f044e25d5f659413bb8fc93cf0c46dbffd2af7096f7cdb24cb67968c611 SHA512 92787dcd32ef1f19c1bc01d0dc1e604c09af81dc380eef6584f6c7bc221b285cc14ec5c13226178e2f44e904353af69f416bafe55db6ad414ad79db4878220d8 WHIRLPOOL 964a88d1adea56b81627586c6e672bb63b6f8370eeb01972d78e8f6563a4efbbc49a97e1446080f477513c925d0d13dd0f94a70d5e45a34b686dc8b1514bb777
+DIST icedtea-3.6-nashorn-a2d2fc80c97a.tar.xz 2231644 SHA256 7245ba3bd15896e6f41300f370dd16a64bfa8fa6bdd69a099c0f14bd7e6546a8 SHA512 950989f71c7fef858eb8cd20024a2094e8d102b921d05fb1e4a320a431c3306178269e737f02318c448f57cd540ae6996552880ae419ef647e7dedb6b4a6ebbf WHIRLPOOL 4d58e5d04644bf41bef5e50aadb3807b7b8884a0eef691816e9d5a2a2124a76ec6562419e07c15e837171bf90d951e60acd0a654481efba23987a6759eae1f5b
+DIST icedtea-3.6-openjdk-eb577ed6ec93.tar.xz 333636 SHA256 cb76591cd13fbb276ce2ac695e3b416ec58072f660c6d93c27bf003c03821d57 SHA512 db794e9bd39f8994b29677dec62b5f47e5ab92b75a3c9c1922903095269a94d4f44b57a73360d64671f3c9a1403d83dbd0251354818842b2f95ac13073d19f27 WHIRLPOOL d63d7d61f4cc64e4019f88a85b9cc5eeee8ef6b3346f2eeca57e151ac3182e7878d52f1827d8a2304f233014ce4926b7ba100f000b90fd7de29167ec90ace887
+DIST icedtea-3.6-shenandoah-7eeed7dc4676.tar.xz 6935216 SHA256 0e04e065df996b967c1c9b5b14765c0b55e91c1efd5bc55a733eefca6bb21586 SHA512 4f3938acc6c49a5b9178618fd4f60a0458cbe5a3df82cb46a5dcafc6e63a74216eea55c42fee5a7ad964cc39ea816f3734dd3a8806cc71feba86e150760b3a55 WHIRLPOOL 4e79d937f5190681f6a2172099bbcb3be068b7c3115e1fe2228bfc552b2f8e2280f3f53a9bac162f2d89b11ff5cb3801ec74ed72caf00a230a26427f500ae0a6
+DIST icedtea-3.6.0.tar.xz 1489504 SHA256 d0a0a9ce58b3ed29f2deecef8b78f28a79315f4a6330ee833410f79cbf48417e SHA512 7e19b66267266453b4aabeefcebe0d889604b329a5ad0338cc54cb49cef2b806fbc7cc0dd7078df231b04e033abe0c47de1b4c78e2f68682d9243e3064159c28 WHIRLPOOL 8c7d823537ac818f99b01f95ef141c6cac21825c55b8bdb26ecf40154224d673429aa86e3d8960e57255fe425a7661c8ee7a24a862876d2084d81a6f1ae70845
 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4

diff --git a/dev-java/icedtea/icedtea-3.6.0.ebuild b/dev-java/icedtea/icedtea-3.6.0.ebuild
new file mode 100644
index 00000000000..35df1718fe7
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.6.0.ebuild
@@ -0,0 +1,422 @@
+# 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="8"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="13a5a8a3c66f.tar.xz"
+JAXP_TARBALL="947a7b1ce48b.tar.xz"
+JAXWS_TARBALL="eafb356c44d0.tar.xz"
+JDK_TARBALL="a05e38417041.tar.xz"
+LANGTOOLS_TARBALL="61a1c711f7ab.tar.xz"
+OPENJDK_TARBALL="eb577ed6ec93.tar.xz"
+NASHORN_TARBALL="a2d2fc80c97a.tar.xz"
+HOTSPOT_TARBALL="9bad7d4825fb.tar.xz"
+SHENANDOAH_TARBALL="7eeed7dc4676.tar.xz"
+AARCH32_TARBALL="7b008fa0fb6d.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+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}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_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.xz -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_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 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+	pulseaudio sctp selinux shenandoah 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:0=
+	>=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/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"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2=
+	>=dev-util/systemtap-1
+	media-libs/fontconfig:1.0=
+	>=media-libs/freetype-2.5.3:2=
+	>=media-libs/lcms-2.5:2=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0=
+	kerberos? ( virtual/krb5 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	virtual/ttf-fonts
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	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
+	)
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		dev-java/icedtea-bin:8
+		dev-java/icedtea-bin:7
+		dev-java/icedtea:8
+		dev-java/icedtea:7
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+	sys-apps/attr
+	sys-apps/lsb-release
+	x11-libs/libXt
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+# @FUNCTION: get_systemtap_arch
+# @DESCRIPTION:
+# Get arch name used in /usr/share/systemtap/tapset so we can
+# install OpenJDK tapsets.
+
+get_systemtap_arch() {
+	local abi=${1-${ABI}}
+
+	case ${abi} in
+		*_fbsd) get_systemtap_arch ${abi%_fbsd} ;;
+		amd64*) echo x86_64 ;;
+		ppc*) echo powerpc ;;
+		x86*) echo i386 ;;
+		*) echo ${abi} ;;
+	esac
+}
+
+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-8 icedtea-bin-8
+		icedtea-7 icedtea-bin-7"
+	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 hs_config 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 Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah can only be built on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		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
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		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
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		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
+
+	# Warn about potential problems with ccache enabled
+	if has ccache ${FEATURES}; then
+		ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
+		config+=" --enable-ccache"
+	else
+		config+=" --disable-ccache"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	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-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_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 headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(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} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	local stapdest="/usr/share/systemtap/tapset/$(get_systemtap_arch)"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || 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}
+
+	# Link SystemTap tapsets into SystemTap installation directory
+	mkdir -p "${ED}/${stapdest}"
+	for tapsets in "${ddest}"/tapset/*.stp; do
+		tapname=$(basename ${tapsets})
+		destname=${tapname/./-${SLOT}.}
+		dosym "${dest}"/tapset/${tapname} ${stapdest}/${destname}
+	done
+
+	# 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() {
+	# From 3.4.0 onwards, the arm directory is a symlink to the aarch32
+	# directory. We need to clear the old directory for a clean upgrade.
+	if use arm; then
+		local dir
+		for dir in "${EROOT}usr/$(get_libdir)/icedtea${SLOT}"/{lib,jre/lib}/arm; do
+			if [[ -d ${dir} && ! -L ${dir} ]]; then
+				rm -r "${dir}" || die
+			fi
+		done
+	fi
+
+	gnome2_icon_savelist
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }