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

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     eaf1be9c087e5d8270cf8244613c879ed34266b7
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Jul 26 01:52:47 2016 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Jul 26 01:52:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=eaf1be9c

dev-java/icedtea: Bump to icedtea-3.1.0pre04.

Package-Manager: portage-2.2.27

 dev-java/icedtea/ChangeLog                         |  6 +++
 dev-java/icedtea/Manifest                          | 17 ++++---
 ...1.0_pre03.ebuild => icedtea-3.1.0_pre04.ebuild} | 57 ++++++++++------------
 dev-java/icedtea/metadata.xml                      |  1 +
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 1314a87..617e03e 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-3.1.0_pre04 (26 Jul 2016)
+
+  26 Jul 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +icedtea-3.1.0_pre04.ebuild, -icedtea-3.1.0_pre03.ebuild, metadata.xml:
+  dev-java/icedtea: Bump to icedtea-3.1.0pre04.
+
 *icedtea-3.1.0_pre03 (17 Jul 2016)
 
   17 Jul 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 9b31481..b57235f 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -22,14 +22,15 @@ DIST icedtea-3.0-langtools-ad6886e3a101.tar.xz 2056412 SHA256 260260115257602173
 DIST icedtea-3.0-nashorn-c89dc17f7c75.tar.xz 2220176 SHA256 e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc SHA512 3cf12d2696b630eec2a4c6fefe08db9e14db62bbd81a3a4546ef886f6b7fa059a2f41dd3a4377ab2da1f65d371b70766caac4054b447454863de82ce961c3d31 WHIRLPOOL ad2ede063f0e6cb1a67f90d42ddcf2ab33175008361620abf04ccc1a55b9e3c2a8a9827100137842c8f6de2a3af367b6143c0916a5ffa4920dbcd33fb66547c0
 DIST icedtea-3.0-openjdk-6a70821528ba.tar.xz 330720 SHA256 8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184 SHA512 5054d4a541b8f3e6fd09cd44355b39d3a0e1ea27247bcaf8bb800e1e3cf23a4133076383b74c19be1928a5fc0c3986ab3303614a834b9741209dcf20eb19d703 WHIRLPOOL 7ea8c98d4dca75325841929aa8049ecf713e637124e4ce6f9a98d7845d25153d851c42f632132ab61ff6823e0aeab07ad0dc43e6f699d4f3747b536e90eb0b76
 DIST icedtea-3.0.1.tar.xz 1403400 SHA256 346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2 SHA512 01506994e3c4b4a1dc927251de0db5e5a22754031604cf7c8660597525616d3205527ed768d67aa4b4c62b40a0e3fbd3327c97b95c81b634175dec69c5802c8f WHIRLPOOL 0641f49b6fcccb3981e2756a2403638897887634ff09b6ede9ae61af80259b5bc1168c6c5f236a07157befec4a1fe848d0814afe5515bb5a98c591370c62dacb
-DIST icedtea-3.1-corba-d920107a9fd4.tar.xz 937860 SHA256 f5d147fa93d42f7bcd1399333c123b7ddbc369707ca1ebfc2db0078a8bd11240 SHA512 6ee7ebe00a2a2b9d1c74454700492ed865606ad81714f6b63088434e97f5325cdbe8713a977cc46a79fad415bd0a5ba32ebc107fb5cef60f878b504e4a0e573b WHIRLPOOL fc413ff06beae386e822f59288659bdb8218fc38ea76b0dd582dce6dfc7bc1b5491c04b54f4834529c8a58ce8e888518793d21053fde462966179da71a4c3b39
-DIST icedtea-3.1-hotspot-ea6933324a7a.tar.xz 6790076 SHA256 2fe149bb8b212f973c013bae36fcc6b589f88b3fb0886c48ef3921f85e216a78 SHA512 6abe5e9b5beead29a246756da439b0287f2ac960e659b78e66e17ebf1e0ed11882a03154f2fedf86c317ad295caed02b2bc0cf96c1baa8e4176c8e041e6cfb44 WHIRLPOOL 0cfb98a3c9f9f80dd0a26087fe8e4fc98599b8f88ad2a7a9d30c4ed0e622b23b4f7e89307a271b59941e75b3bfc0b759062747e28c5b94696cdbadf27eda23af
-DIST icedtea-3.1-jaxp-5c97913ea9f7.tar.xz 2297432 SHA256 d5da8f017de517665f228606a8c49a48dcd4ee881f6a619f0ec5a297820eea86 SHA512 c7c578128921df7b9eaa9c186e11e979c81f3ce8d2c11268ab2801a016f4b033885cfc692a9789c6645b0ecc774c13d55fd0d3ec1e094581f81fa3843114f9bd WHIRLPOOL 2f8b4514b2b0b3cab09091221897c627a8be0ad0c204bb2f64a517a66687320ad96c44fbcd2a4382900dd6f1ec9ae56b112897a794fbef06d8728638d64e6b21
-DIST icedtea-3.1-jaxws-82ec7b3637db.tar.xz 2267196 SHA256 6ca78d91139cf035e8bf79997ef386f1037e940a1b4e498280406fd2a66779e2 SHA512 03e5b861d61eeecf4907a576cbcada9388ba9c2a73d61a7894bf3f043f2d6533b74019278149ec30d95658992ea7cb65710dd6fe985cfff7c8ca33e2f50064ab WHIRLPOOL bdc45ec8f9ba3573e75944185182bb14cc410157a0101abbba1aff8ad6eb0a82c2089577d8cb02873760cacf1355de7bf2886ef914b6767a4a7dd13d37419777
-DIST icedtea-3.1-jdk-aab729e0626a.tar.xz 38650436 SHA256 b3a4fb8e2ed9cdc6fd2d761ae7a740b619bed43de8f78363695661e20882cefa SHA512 344fcba52082a612de99f9bbc77a0f7d8c5694f8a47dcb4890ce014bd21af617133fdfb14893dc5620ef7d7248ffe0505e46bde5dc2b0c0d7261f9f0cd88ecb9 WHIRLPOOL c53c42dee9caa423cc19223fbe6fc16aec5c546b678513a2e765562c1d0f6acc0ccf9b52783681c67bddd66ec00d39577ef59492037824dc84404c0f634b23a1
-DIST icedtea-3.1-langtools-ff680965fa8c.tar.xz 2059064 SHA256 71271890422ea55a994e8cf9a93cd089f326d613a5897663ba5a70e05f45514e SHA512 1f421a68f20fd425ab8726624dfb2e2a27b26c784451c357c899cb64337ad746c7189b74729b88adec77fef17d4ed6713a55ca930c2d24b41730dbcc45443931 WHIRLPOOL 48a855b7d2a3b963a3a653bda926ee2aabc05d148f9a433dc10778a0a2078754b8441504b5cbf90ebaf7dc58bcf2c33def7afb4a015126e8323ecb4735815fe3
-DIST icedtea-3.1-nashorn-2417a5bf2b15.tar.xz 2222976 SHA256 c930badb6481d98ffbe919108440a3cd675b6f61bc862a880933d3e07b282b26 SHA512 d38f668d49e02e0b0153abb538bf6ea3c0c35e65d25ded7a0fddd9146db0a6366944bdac792a3cff236a3ae5ab512caebfc8452685825fc529995d5b2ce011fd WHIRLPOOL 4a8d43fdddd46bf7aeeee2b92e8f437fa66055868770d0fefeede072e1b046472fb99e38c09106ae4669cc4297a49ce746ad66a77dd0a7b080de8a63295f1b76
-DIST icedtea-3.1-openjdk-a161af8a08eb.tar.xz 333644 SHA256 3fd511e872d35d3c82f9cf2f301a89214e27ea81e2d5ad8ff2ccf0fd4b4e9994 SHA512 625c8cbe48a78232f3a2fd37a299dda65a482647f1c2baef01857da5a3745b2424fd3aab75212db0608b30cdf24ec8215b79bfeec401ffeb182221ff1502e2fb WHIRLPOOL 0434a37489772bb94be0979fd3771653e218cd2afa96fbdc41919a5a0ba9b6ea18db98179422f0a34551acbf094da2482e9173012321eb27f280ae2df5c17532
+DIST icedtea-3.1-corba-b74e7245e405.tar.xz 937832 SHA256 09911ffa934ef93da8d2b6c1ea9985f742289f8d9358dd6890a657a5c01e8858 SHA512 547ae66107b4a86cbac834294750d6deccccf558785eb6294d5fb95528af6a331b351a2a48678efb80c71815aa2ed593b7fa8f7a93cf94c87e79ce6275f1c7a1 WHIRLPOOL 8525694e812c87be6ef20d6fd36262fd625d4b1dd88151e717bb0b418290bebb2cca3828af2b6ab0e9c481d7a809d867d11078c58dfe8948b3f086e18ee9927d
+DIST icedtea-3.1-hotspot-0f47eef348e2.tar.xz 6786896 SHA256 e41072fdf970b226267d3be19189ea980aeeffc5c3e34574bb5980af603cdd9f SHA512 4d79be3f7e39f33ebbce9c8317ced1de8a73669b7445e3b1b64124c0ed3a34627fc0cbd5eb00a213a42512b405cdbf19788ede4a127808042bb4970e39fec2e8 WHIRLPOOL c0f12d100e2465bed7e49ece330911cad32c6f09c99341273f0ee8e4c98695ae5a7f7cda92ebb7468363c2180c52ef4ec7fd3a17a61203c74a102a3fa25e1ae8
+DIST icedtea-3.1-jaxp-0de4d7e1996f.tar.xz 2297040 SHA256 5436ee8451cd14e5f263a3eab9b5cd18d35f940c97aec3e0f5c1e22fc34c31af SHA512 4754a205efe4b7785a69fd87a91b5042a59a5d2be8260f1e54b101b22d53831c3614d19f1195b8f0b6c31f7af9fec4dd8f5f2b5f809eae0177c9721023a5d147 WHIRLPOOL 13f9c43a59e4d3d1cd30ce09d297475e517407144703b89e2272f79702bd12fe00c91043c03dad16cf7b446a055e1c5f09087f8744e11265fec0004546234378
+DIST icedtea-3.1-jaxws-9812eb7e305e.tar.xz 2267460 SHA256 6601617778efdf42b882cd6c918eec0ac854da7bbe730af45855e0ac27b488d7 SHA512 1ddb7d3d596583b6be4a1b616baebf7d163b2f9a0e27bc4877c0a5225dd594d7adcfd995e6077e355a8b1452c4b23fdd641b5a4196bd2b15bb034888fbff2528 WHIRLPOOL 17f757ce1f5ae9c5fc6a8e1050c45a930a1f15c404bea62b1cb6edb42034925849d8a70f2138256513358b214ec8c73ddfa60762c0c5c215ab09f8f4cc9aa8fb
+DIST icedtea-3.1-jdk-ee0b65b8fd10.tar.xz 38652824 SHA256 4f78f29d385725807759a4400d8d8202f3b378bd0e242026d7e33ffbc2245502 SHA512 c1fcd3aba16ccf3fe1bd4ad1080b64c9880382acd710d818cf28c29b1933987946b1282fcee38175f5d909d7ada815d240de801e642b1b82cdcabf7e1bb2b670 WHIRLPOOL 01ccebf0cfd95b8d262ef785b172c74e89407ae847e8b6197aaf1b609fef2de447af449f9be8ffe8c3b14f8399551650cc94bba08e48a7c691a0ce0528f25f23
+DIST icedtea-3.1-langtools-fc69984700e1.tar.xz 2059728 SHA256 921956c0064232015d5905af9f05bfec0ca901d00ec7967ea4c4314ac4730d15 SHA512 d9c3c1954dc8f7ebf3a17a8599ebc322d29e5bf42a43bd7e135bf7a430eac07c0af3ac97d144028b43bc65b3fc6ff87a3962d6a91749bd0b36217d0e61013a53 WHIRLPOOL 2072dcb63648be74ee126096aa8fe0fc6893975008081340d1c495577d630a97cc7b4be8b80f9aeff688636a742129f4bdb2abbabe69dcf477cca0001ca7ca9b
+DIST icedtea-3.1-nashorn-68145b690b18.tar.xz 2216328 SHA256 d67f211a1f0c65051044aa395579d5bd2f4640f1e99736153349b7657ca96bd0 SHA512 4d2208cbe4698d6a84255e1b6b43a6b6c4601db259d53f1d411ba991ee885c33f0b3f76ca960a1dfcf249850e07a409821af5c37b4973d78d6f3725d669ed6d5 WHIRLPOOL 6a2002af089b2db0c07dfb3eb37c25257fda5cbc5b38720240aba185ad9cf343d77c764d7758a7594f1df6dc7995794ff357ef9b5311d8eaf21ce2493d9123a3
+DIST icedtea-3.1-openjdk-6517c9e186c5.tar.xz 333716 SHA256 18c07b4d6c36084f8a2a727dd95823535674ebb423921dc9b1c20642548909d0 SHA512 c4c4717912c8d9eaa0e3e170a24a42ad715df139b657576b838b45ea96d5f8ae1a207a5b0bb7b176685880221fd688a25160c3543033cac945906c87479e4b20 WHIRLPOOL 757f4a9008456b8da4a280236e7b53bfeca429d21736a72ae12ac781fd4da1d8cdda8a7ebba43efcb8f44ed9a0c5870fb4311bc8eb3acdbae2e9b972486470d0
+DIST icedtea-3.1-shenandoah-ec2e71f375b1.tar.xz 6828964 SHA256 3a4579daab230b7cf8f05074a686e3a4a76184d87d6bc277d735543ad683b38e SHA512 e9c7b92e13cc1d5168cf88c720a9866551273cd9ccd0831897e0361ece5e7a73edbd0783e3711f1506def926f5fd36493ed7f055ae65b192228796399f50b339 WHIRLPOOL 47ca98d2b57e9ff16158a0420a2c5925188b8e4ebe2d669fde6a1079002ef4da70644dafa048f565c6960eb97300b608b483676f8f7a74b7a5a98d57bbed54b3
 DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 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

diff --git a/dev-java/icedtea/icedtea-3.1.0_pre03.ebuild b/dev-java/icedtea/icedtea-3.1.0_pre04.ebuild
similarity index 90%
rename from dev-java/icedtea/icedtea-3.1.0_pre03.ebuild
rename to dev-java/icedtea/icedtea-3.1.0_pre04.ebuild
index 981f222..83e1651 100644
--- a/dev-java/icedtea/icedtea-3.1.0_pre03.ebuild
+++ b/dev-java/icedtea/icedtea-3.1.0_pre04.ebuild
@@ -17,14 +17,15 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="d920107a9fd4.tar.xz"
-JAXP_TARBALL="5c97913ea9f7.tar.xz"
-JAXWS_TARBALL="82ec7b3637db.tar.xz"
-JDK_TARBALL="aab729e0626a.tar.xz"
-LANGTOOLS_TARBALL="ff680965fa8c.tar.xz"
-OPENJDK_TARBALL="a161af8a08eb.tar.xz"
-NASHORN_TARBALL="2417a5bf2b15.tar.xz"
-HOTSPOT_TARBALL="ea6933324a7a.tar.xz"
+CORBA_TARBALL="b74e7245e405.tar.xz"
+JAXP_TARBALL="0de4d7e1996f.tar.xz"
+JAXWS_TARBALL="9812eb7e305e.tar.xz"
+JDK_TARBALL="ee0b65b8fd10.tar.xz"
+LANGTOOLS_TARBALL="fc69984700e1.tar.xz"
+OPENJDK_TARBALL="6517c9e186c5.tar.xz"
+NASHORN_TARBALL="68145b690b18.tar.xz"
+HOTSPOT_TARBALL="0f47eef348e2.tar.xz"
+SHENANDOAH_TARBALL="ec2e71f375b1.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -37,6 +38,7 @@ LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBAL
 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}"
 
 CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
 JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
@@ -55,6 +57,7 @@ SRC_URI="
 	${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} )
 	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
 	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
 EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea8"
@@ -65,7 +68,7 @@ KEYWORDS=""
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
 	jamvm +jbootstrap libressl nsplugin pax_kernel
-	pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
+	pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
 
@@ -208,7 +211,7 @@ java_prepare() {
 }
 
 src_configure() {
-	local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
+	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.
@@ -246,6 +249,17 @@ src_configure() {
 			use_zero="yes"
 	fi
 
+	if use shenandoah; then
+		if use amd64; 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 x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+	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
@@ -274,12 +288,9 @@ src_configure() {
 		zero_config="--enable-zero"
 	fi
 
-	# IcedTea itself doesn't handle ccache yet.
+	# 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.'
-		export enable_ccache=yes
-	else
-		export enable_ccache=no
 	fi
 
 	config+=" --with-parallel-jobs=$(makeopts_jobs)"
@@ -292,7 +303,6 @@ src_configure() {
 		--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-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
 		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
@@ -306,20 +316,14 @@ src_configure() {
 		--disable-downloading --disable-Werror --disable-tests \
 		--enable-system-lcms --enable-system-jpeg \
 		--enable-system-zlib --disable-systemtap-tests \
+		$(use_enable headless-awt headless) \
 		$(use_enable !headless-awt system-gif) \
 		$(use_enable !headless-awt system-png) \
-		$(use_enable !debug optimizations) \
 		$(use_enable doc docs) \
 		$(use_enable infinality) \
 		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
-	# OpenJDK is quite picky about ccache and dies if you attempt to use
-	# it via wrapper symlinks like Gentoo normally does.
-	PATH=$(sed 's#[^:]*/ccache/bin:##g' <<< "${PATH}") emake
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
 }
 
 src_test() {
@@ -337,13 +341,6 @@ src_install() {
 		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
 	fi
 
-	# Ensures Headless-AwtGraphicsEnvironment is used.
-	# Hack; we should get IcedTea to support passing --disable-headful
-	if use headless-awt; then
-		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
-	fi
-
 	if ! use examples; then
 		rm -r "${ddest}"/demo "${ddest}"/sample || die
 	fi

diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 0dfefa9..da15497 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -31,6 +31,7 @@
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
   <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
+  <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (x86_64 only)</flag>
   <flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
   <flag name="sunec">Build the SunEC provider against system NSS</flag>
   <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>