From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-813527-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 6C509138CEE
	for <garchives@archives.gentoo.org>; Fri, 19 Jun 2015 17:07:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1C2FE1401B;
	Fri, 19 Jun 2015 17:07:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B80A31401B
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2015 17:07:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3F04E340AD7
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2015 17:07:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EA0E7A45
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2015 17:07:24 +0000 (UTC)
From: "Andrew John Hughes" <gnu_andrew@member.fsf.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew John Hughes" <gnu_andrew@member.fsf.org>
Message-ID: <1434733625.c45be24df0767462bdba34d98b79a280c3b14213.gnu_andrew@gentoo>
Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/
X-VCS-Repository: proj/java
X-VCS-Files: dev-java/icedtea/ChangeLog dev-java/icedtea/Manifest dev-java/icedtea/icedtea-7.2.6.0_pre23.ebuild
X-VCS-Directories: dev-java/icedtea/
X-VCS-Committer: gnu_andrew
X-VCS-Committer-Name: Andrew John Hughes
X-VCS-Revision: c45be24df0767462bdba34d98b79a280c3b14213
X-VCS-Branch: master
Date: Fri, 19 Jun 2015 17:07:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d9d8004e-150f-4350-ad53-0a45e287635d
X-Archives-Hash: 486cf87455d8c724f8f406ab20534a88

commit:     c45be24df0767462bdba34d98b79a280c3b14213
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Jun 19 17:07:05 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Jun 19 17:07:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=c45be24d

Sync 2.x ebuild with 3.x, adding improved alternate VM support and removing branch name from CACAO + JamVM tarballs.
Turn on SunEC by default as in the 2.5.5 ebuild.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/icedtea/ChangeLog                    |  6 +++++
 dev-java/icedtea/Manifest                     | 13 +++++------
 dev-java/icedtea/icedtea-7.2.6.0_pre23.ebuild | 33 +++++++++++++++++++++------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 1e08309..30885bc 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -3,6 +3,12 @@
 # $Header: $
 
   19 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  icedtea-7.2.6.0_pre23.ebuild:
+  Sync 2.x ebuild with 3.x, adding improved alternate VM support and removing
+  branch name from CACAO + JamVM tarballs. Turn on SunEC by default as in the
+  2.5.5 ebuild.
+
+  19 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
   icedtea-3.0.0_pre04.ebuild:
   Allow icedtea:8 to be built with itself.
 

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index cffd49e..2375678 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,10 +4,8 @@ Hash: SHA256
 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
-DIST icedtea-2.6-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
 DIST icedtea-2.6-corba-9d5c92264131.tar.bz2 1072026 SHA256 744b293bd34a570bc2155698a3e46572cb0e8433f7edcdcb594a37d8f8ac1cdd SHA512 0b6a0338c7fdc6c501f7fc3a0d8e504989c0342820d3e5705d81b7066bf10387d7adf0e6cc49991a5f80f61da8fd480a6a0e8d7bbdf8272ba81047a84393b770 WHIRLPOOL ef944ce528d90a3fed7c69743c4577295b919a8979517eac84d2f21d56c4a375c7194740e96662e2c9ae6804bd87b11b6a5d507da35fb7f6b92c66e0afb6bf5c
 DIST icedtea-2.6-hotspot-1afefe2d5f90.tar.bz2 8159547 SHA256 e12e2d3d7b228abc3fa12a75455d3af883bce94f58df65e16e7f953592747054 SHA512 b00815a59dad0d8a786ef78147aafaa29e480cf19c83fbbda8c2fe9d7118f5cbecd8a211bfdd0a5fef62c4b2903bf093396a0c93b1e27e9cac4d5e06d37dd6dd WHIRLPOOL acc0781e78a9c924e8f20b095bb50d4bb5dd76806b7143458495b7ede06545896992e89f10ed069d2aed081ee07cc3542832904d38c13d68f56277ac5208ab16
-DIST icedtea-2.6-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST icedtea-2.6-jaxp-9150a16a7b80.tar.bz2 2738252 SHA256 7325b18725730e780049259b428c8814fa8686f49c27ff419e03cc6926e88f87 SHA512 a46abd35c7604919e94aa3e8d6b6ef61920956ddb16c8a29f1e3eb0d2ceccd356ab15b5d592ce2a6daa83e96c2b5ca25cd56d63a4753d549ac1da06355493672 WHIRLPOOL 9b78984173de66364d957da52efba79ce0dec91593096295dbe76ad582cc984999cee804de45f06f10311481147fb7a50dc3eb3798dc1d04704e987b02277c14
 DIST icedtea-2.6-jaxws-87290096a2fa.tar.bz2 2020651 SHA256 760c32f84da4cf8794d685431135a7017217f48a16449b78313648d8aeb89097 SHA512 900209d0577807445ca4444ef1010d7aba5feb0634bac900705f4d56837db44ccf852da3e9bc300529cd8a80bd61999e745a8e23eee6878574bf6e3d71c263c0 WHIRLPOOL 07a214b48662626b545cf8e89437d1882e53f31019572378333d539749634f76fba0fa36ed7878ea4ee22a675ac361397f6c3ff6ace480d178cfc56c35128285
 DIST icedtea-2.6-jdk-ec336c81a545.tar.bz2 32381225 SHA256 7019b768badebe30ec3cea2fe04b240b8760e9879d8d215f3b6151d8f1dce9ba SHA512 6b1298afbd06881ad1463bd56c5afc390dd409d229493b61acc70d5b2acf0b13aa0009686f72d722c3b25396ac7482d7bea2019dbd5f6951418ee85aedcb044d WHIRLPOOL 878739d0901efd337963d9a8c73b34f2e33cd3abe0d54b4a44206ee0cd1cf74ad00910ae5447245e56065402f2e98bcfee19932281ca91801191f8efecb2d18a
@@ -24,17 +22,18 @@ DIST icedtea-3.0-openjdk-0503e9c58a13.tar.xz 320224 SHA256 50733aaaee4dd8df3206f
 DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
+DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
 EBUILD icedtea-3.0.0_pre04.ebuild 11503 SHA256 b712381e2a02b87b10782bb6f97ec6ebf89ac1234acb68e57a27513687b537d6 SHA512 7b398b7f6baaf73963d0820fc3542bf304e509015bd787360cf963026d34bbde5243b3c2eabf66f343dfc2ba6265a802e486cbdfbf4ea9e7fadb9cd3a7bacbd6 WHIRLPOOL 1bd94d5a170dbdf620d29c5385093bddcc688b2758546202184c0fe23b985aebce6de32f3a8023035c848d2ad1b9b25d99cb990d3a17767b61360b60635c410e
 EBUILD icedtea-6.9999.ebuild 10839 SHA256 ffa41507a26006ff1e7a16e8ca71c399dff000f5dcf080db57fe05a0aa539538 SHA512 2e52a795b404784ce5669c1e085761e623bf7dfb433eb0312989dc47b9ee58c97ea31052c486bafa66b20ab7bd82a35a43bc5866dd1047852d144ab65629c3af WHIRLPOOL 22dccdf4b9232e2d6d231e86086924c3005da09d152f7c3db651727e4791f03e85e43c32bd2693691d326c38c6fb384313aa1bc50fe26d2ff700d295f824ef52
-EBUILD icedtea-7.2.6.0_pre23.ebuild 12748 SHA256 bed5696805b5a9ee86de93511638911984b3ae92b496fc4c89f10885968946ee SHA512 43930c64f3c1805748c6a581f5fd148038fa04bab370271e5be3b140694a648c9581dcf6b9b69d3ecc7da4f9ae1fd1f0e0fe8ab1a533c2f9fccec8603bcc8aa1 WHIRLPOOL a17d5c72dd5da012a96a0983e53db6a49615ce89353846441b45f4f6e911a6c0ba4830b9926d4830531c51b081a91541c78b12b1d245bea85dfb4ce0327ccfe7
-MISC ChangeLog 90527 SHA256 7a4c965e838e26307dba19ebe844e9c74d2b238f2bc384540aca017bb9d031d1 SHA512 6a813588a2bac63efc97310144222bee3ba0bca18bc670d8bc8cce23f565cb60e61164426318e41924b753339930003a50a4fe821bdd7af564d590bcd88fddcc WHIRLPOOL 58f3ae782a1e9863f03c2c86e0f5fd5a2405e88d4cdc9200e02ce0072e0cced252799a36ca924a426c74000be5c0fac5007187ca22f2097a11e847177081ac38
+EBUILD icedtea-7.2.6.0_pre23.ebuild 13401 SHA256 1e15338b288127c3a08cf4f69ddb484d1c7f351bfc0699d6a82ffd9d359bfa49 SHA512 9e1da214c40a6017bbd8d5570b2d87a17e7c574adcea1e558c3d0315a15b8d8c8836f16ccab22b70b72a256155cdb6dee27677b8a18cfc12a8c360938f51e4d2 WHIRLPOOL ea3f2c005aa7316789b4164fced8e6c4c4217ad943710c0f310bbc92e353de213ebd950caad989ab416ed95fb939b876fd35b1245022e4cbb19c15aa8ea5c841
+MISC ChangeLog 90794 SHA256 45e352b2c1d414c5f7384aca3b5102c98fe17ddb42142be0cc2522aca89d7f25 SHA512 6f87f4f1da697b6a18193b8464b96a1cdf9fcadca546e3be1497359e74eb5aa0afab2e758d9713b7e2d64a7c41ef11620a69c1dec21377866f064aee2a42cd6c WHIRLPOOL 9d473bb16ba91abcf029d45ae942507f29b47c23f9f8313b7988a738a50fc636845a0b053530eccbc8b19fd2cea8e072301d059d81aef21d457415dc5d22feae
 MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EARYIAAYFAlWEQikACgkQz9oPmzWWQiKm7AD/RgIzCvJgXfLQUepUHaJlYx/J
-2jGqJkkrqqP2hYKQblAA/A2axvgLWVqP0OIOJaFkty9Te4gMha2wA9mtb1c/8q4I
-=17/6
+iF4EARYIAAYFAlWETDQACgkQz9oPmzWWQiIilwD/fEws8aH19AXD9LCfPqzipC6g
+bFf/Vicb2bglI+4bP+4A/iMsuGUlsd3u+OM/DZaoUg583noeEOz0KQSbvfRX7bgB
+=3XLy
 -----END PGP SIGNATURE-----

diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre23.ebuild b/dev-java/icedtea/icedtea-7.2.6.0_pre23.ebuild
index f4304d8..bb832d1 100644
--- a/dev-java/icedtea/icedtea-7.2.6.0_pre23.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.0_pre23.ebuild
@@ -36,8 +36,8 @@ OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
 HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
 AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
 
-CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
 
 DROP_URL="http://icedtea.classpath.org/download/drops"
 ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
@@ -62,7 +62,7 @@ KEYWORDS=""
 RESTRICT="test"
 
 IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin
-	nss pax_kernel pulseaudio selinux smartcard +source sunec test zero +webstart"
+	nss pax_kernel pulseaudio selinux smartcard +source +sunec test zero +webstart"
 
 # Ideally the following were optional at build time.
 ALSA_COMMON_DEP="
@@ -205,7 +205,7 @@ java_prepare() {
 }
 
 src_configure() {
-	local bootstrap cacao_config config hotspot_port use_cacao use_zero zero_config
+	local bootstrap cacao_config config hotspot_port jamvm_config use_jamvm use_zero zero_config
 	local vm=$(java-pkg_get-current-vm)
 
 	# Whether to bootstrap
@@ -229,6 +229,11 @@ src_configure() {
 		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"
@@ -250,6 +255,15 @@ src_configure() {
 		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
@@ -261,6 +275,9 @@ src_configure() {
 
 	# 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
 
@@ -288,17 +305,19 @@ src_configure() {
 		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
 		--with-pkgversion="Gentoo ${PF}" \
 		--disable-downloading --disable-Werror \
-		--enable-system-lcms \
+		--disable-hotspot-tests --disable-jdk-tests \
+		--enable-system-lcms --enable-system-gif \
+		--enable-system-jpeg --enable-system-png \
+		--enable-system-zlib \
 		$(use_enable !debug optimizations) \
 		$(use_enable doc docs) \
 		$(use_enable nss) \
-		$(use_enable jamvm) \
 		$(use_enable kerberos system-kerberos) \
 		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable smartcard system-pcsc) \
 		$(use_enable sunec) \
 		$(use_enable infinality) \
-		${zero_config} ${cacao_config}
+		${zero_config} ${cacao_config} ${jamvm_config}
 }
 
 src_compile() {