dev-java/icedtea: Update IcedTea 3.x live ebuild.

Package-Manager: portage-2.3.2

3 files changed, 33 insertions, 24 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index a7e1d7d1..e1e6222a 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-3.4.0_pre00 (14 Feb 2017)
+
+  14 Feb 2017; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +icedtea-3.4.0_pre00.ebuild, -icedtea-3.3.0_pre00.ebuild:
+  dev-java/icedtea: Update IcedTea 3.x live ebuild.
+
 *icedtea-3.3.0 (28 Jan 2017)
 
   28 Jan 2017; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 0968b443..17a480d7 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -14,24 +14,24 @@ DIST icedtea-2.7-jdk-3fc5cbcd46dd.tar.bz2 32414746 SHA256 44adca39f854ce57defd76
 DIST icedtea-2.7-langtools-caa50dd46a14.tar.bz2 1709753 SHA256 1a7195adfc1f05ecdf17559dd8afccbbd9b8c61e96f290a1e2ca9659856b4fa7 SHA512 ec0d89ade1edd7e2500f4257de8a6dd8afe8e89e8d14a730963378008060dd6a087e40cc4faaf769e7b9ca6f070356d70a0523359a81ed39ac9d032c9f3c4ec2 WHIRLPOOL da0e7fdb5ca5a65b19eefcb7e8c4d90337d73d2cbb85fe01c327969f85a1acd552dd97abb4d7bb9fcf87c0fafa1b0e1d6fc07e7f19507c428037e0e1dc02ed29
 DIST icedtea-2.7-openjdk-7f245987a287.tar.bz2 129791 SHA256 72ab3fe89fab55d430af49ffaae216317e8a88b963350a7a695870f7fd744c33 SHA512 2ab9673ff532a77d339039c83f5253790c5fdf6e17eacb2e7af4b70e51ba1d0a74cfc81cdb3f8ea62ead73015ca53ff1dafe5e309d575de3e4d1d7c18c0960ab WHIRLPOOL 27093166c56cc5e89a3493e0e505b3e97b374d454e51d8fc47e65e539c55881854a7efc829749529b3bebc7e183b19c319fe4b0934cb483e8a3fc2af20c42232
 DIST icedtea-3.3-corba-8eb9dd5fe2fb.tar.xz 940804 SHA256 19492bdd85166ce55d0f85f96e1d3d0b21e61f4604349ea0b94f6a0aa1388b61 SHA512 b1f44e1e41b3565bd45176f726e4d1c2999c5ff25a5f2e973f0e5836b7fd2cf6540eae83d3944b303677797e052abd950bb9748fb3e218e4c71b1ea059bf1209 WHIRLPOOL 35113a5283f3a36cd6b5d4022a187995fa75e7aad5b6517437af86e3314bb87d59f9805d0aa37d02650f12158d6088b54f0931e3b8ceea1722f9635b9fd0c0d2
-DIST icedtea-3.3-corba-9d3757e6da35.tar.xz 939832 SHA256 902607987e26c67489f01fe8cf693fbbbd5850f3b9b06ff12af5486b75822387 SHA512 b66f13f3f65085857bbdfb37d4d05a872a4cdb115394787365c8b4f67a70b95df4c66702b930fb6ec637e9f5065e21283df344127d618477d3e1beca7b9d047a WHIRLPOOL d5b5e96f55e9f0d61eaec4f22e4006bfd2a75ad89e603bb60fc74af8b05e19ab70dfabb05c30a8919b980857a1ba7631d0d322ee0b000af5352f6409af9e3dd1
 DIST icedtea-3.3-hotspot-6efaf77e82a1.tar.xz 6813884 SHA256 280f706bb0aaada0903e9e907811ea12bc1c216fdaeb2694910f3a99217f6e89 SHA512 8a593b1c9f022e7a3efa834c5547c59f1a2143f946edae2647a3368f9d4d39b9d473f36575d395e627e5bfac1f9cdef0efe607e0a81b40c46dca44ad6d59a65b WHIRLPOOL d6866b734102251a94367dc1a67e4f895f1efb96140438bbf0fb270c2a45325b8c97cab8d0d5ce696a8c19cb62af8f9f586ceef8e663de3743d54be47d90bf26
-DIST icedtea-3.3-hotspot-be4aeaa327f7.tar.xz 6809636 SHA256 9dd74ff7ac16b6104410c7c331f39e96fe50940e4023201b1a2898a8314e1fbf SHA512 69df8dc706900d07eca71982de27c55c9cde18c41061752e91108c30cd85d0d9b37f8b9e041aab0622746510900173bb635cdc4cc3c4fd0f795898fc15158441 WHIRLPOOL 09077c8c10dbc90585df60ae785411ac4dcc14f3955cce52fd1aea5b6c24cf3ee07ffb865275f239f52d04aa5553b63fcbf4f889b312a6cd41e98cab3d946925
-DIST icedtea-3.3-jaxp-81c2773fbb0d.tar.xz 2301272 SHA256 61d6c7a44746ace38812582474b66c2c96f1ce9c7bd5b9ad251b4d5982bee6d6 SHA512 44c0c43509a5c7e7f95ff319a857019acfc1645cadc584e5a20bbc4df2ba154f1d6ed85f9e6154f5526800dcc997971b53762040c2392f4edafe85c55e05721a WHIRLPOOL 77f887aabea7347232cc1c18acbb15ebfe5134e731970c112be6bae97ec1fe6bfa074d26e03eada7c3ad5bc2e2902141684f042034ae6954fb8b7a562439ea9a
 DIST icedtea-3.3-jaxp-faf1c4a9a51d.tar.xz 2302792 SHA256 ba5933a2bbf04b0786fd5f046d43314f1b1b2bf2888c586521b37410783bccef SHA512 3addabc7478c8a443de5db5606b9eb71778484ed68943d3aa2b61c02bff993d3cb446333be7a5bfc90f8757d0125eb1f53f2483c60c79bb0f19e642e1696ddcd WHIRLPOOL 724e224e5974b01ff87f1319beced1b70ea65740989ab7d2c9e29d76e44d537cbde4f14c05bf3083d908fcdf58c336594bf12b0dab7569362ec687272ba21565
 DIST icedtea-3.3-jaxws-5f5237104669.tar.xz 2269396 SHA256 a443f3243978a87a055ab103468878e5e072706ab0c82d1949ba869fc63571b6 SHA512 1b83b0a90cf0c11220cae034d2f86ad51ff8f6d153dc22e8e9f65b8ec4de8f7148fd37356aa19098e6545967da3c53e87edac747adfa76e254c1fc9d31e4ec1b WHIRLPOOL cfd75b4209b3b654269b916697c09a3c537c80ba3c66721287ed9aa23bfb9691c563dc2371bacc9ba4dba0080212f86cfc7e5339b6c2d0e5d6e641e486bd54ab
-DIST icedtea-3.3-jaxws-f57f3ddddff6.tar.xz 2268764 SHA256 1285b9cb273b6fa97f985ace4cb6b5dc1963b1d5e0ae06ad4802f5ff678465b9 SHA512 5768d2dcee308e4060f797b30176959ea1295fd448a1525ecd40fc8a5bd1e97daa81813c19d1aed370f063e81a33bed4a6cb6bbebaa55de11f6173c7eda86574 WHIRLPOOL 58f071d6e0e97f2797b5088eb6b70e846f1284243049adfe2dfefd86694368146ab967dc52164b24c62b20ba6a4802cba4c2f4fba45e46ab08446c2ee4ecb8b6
-DIST icedtea-3.3-jdk-0cc71de3df18.tar.xz 38857856 SHA256 92557d8fbf826a643c730bbb4081e87140eb45e40e5662fd3d75829b5f61c9c5 SHA512 c52136ce97db6a77fd878f4af8182aa1232a02f6010ac9cf570c99ef9576af6427f703b10efc6546bb4a72f91e2f2c39a891b54b9b34ecfc997713ed2a74025f WHIRLPOOL 67881505d5125f9a2c893c0e298fd81721ce83f35fdf2a19430b465edcd18ed0b5bf4a6846c50ff34f68765be5968aec7bee0015c812918b57a19a566d91c903
 DIST icedtea-3.3-jdk-3642a826880b.tar.xz 38972276 SHA256 688e962ab13055eb6b8668bb48b50eecc7f02f5120b541cfa58f516f875f9f9d SHA512 60c932a057dc1869bec52ea73af2a21af9e622a196510d074c5d17c01bf7d98babd651f5577bafe96a832e6a54ded8704c4f7d964f0874edaf2222bdbe3c0c46 WHIRLPOOL 9a8dba06351e70e973e6f1fe01ac5aa4f3e8db4ff2c073df8ac0d88a94f65bd098fc2183bd76329df8cd248cef13170f0c986c9bd1a784fcd3f54b84c9290661
-DIST icedtea-3.3-langtools-a553c153d376.tar.xz 2061172 SHA256 94d1754bba9020b2ee658c7adc2388ac38208e71e55650dc0393d24b20816a4d SHA512 b799f21be6bab4cec51a3b4b8e3b578aa91501449bfd336c0fedb04df109644a41e57e847eda65bf4cee54b3f55bb8785a4c0df5fb5ff9021870883c77fe3898 WHIRLPOOL 47b7b9a897ca5f2d4614cbbe3c6e16df3030d3449426f716cbf53521ca8b9e0f8d3183a0deef7cc99aa9ee95b92e00b6f9f146322325503d137f032b0f8f3a03
 DIST icedtea-3.3-langtools-d10a13bdc98c.tar.xz 2070432 SHA256 1b0b0fb49c81955573ce509e1801530faa6477e606192fec4b0f951904fb8ac0 SHA512 13065b54ca036ad11b8879d9ebaa725a823c25cda5b28f0092902bda2b8879cfd000d132916302f2661b63b03c0bec90d1adfe4863d38c201cfbdf74f1f942c6 WHIRLPOOL 257b6ac9ad6c515445f051b531f51524e3d34518686ff4c4f2fb416d26fde20746330499da9e41e545dc19fb398134c35b2080ee26e608c0b24e8fb25b1f3901
-DIST icedtea-3.3-nashorn-0fb33c8b64d1.tar.xz 2227096 SHA256 5f72fedfa82415fdf98a0a9bf01d2c171b060810b314bf5bb1c69b57123dc910 SHA512 c526678a0c406300e92e8290617518bf326e6992f0cf8b305aa28b45e52b92cbd5a5fa54ea9ef93862a0acbf1a14a1f15986bc64ffb55a6f769a5be068e0e5e2 WHIRLPOOL 82885f077caa95f72f0822318655ec9c01b9518fdb5501230817a6dada7e9e387e8cc27f3b15194460cf9fdfb58a23ec6e09cd9f6922916bb6ea1e6539dee98a
 DIST icedtea-3.3-nashorn-8c0fe384c4e7.tar.xz 2229336 SHA256 0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95 WHIRLPOOL 0e9421c077d617f2c67a67e590ad8e8322ebf33559a1f127efbcfaa1e30f3437bb8749d656fca211f4f848fcd98ebc5f41449a39499a9dadc64990d45fe000cd
-DIST icedtea-3.3-openjdk-200203ccf4bb.tar.xz 336232 SHA256 6c1040b4044efdd0c413d15865304f1ac46230d91435a31347a7b755e91e7924 SHA512 89a3d39afcd6a7a1c8c55d0b7aa1a4c3d87878cf97ffe96fe13fe014edb28588cd8505281ba127eb6275b3639bbdc28593cdbf8cd56e4b033fa83c75c48b0029 WHIRLPOOL 67481776d8f838a388ec0e67cac0cb7466fa0bea606b359f003958cd8097f5c23351a6859e804d71f3ece3c0d122665857d8835818b809a9f025dcfb6d8d24b7
 DIST icedtea-3.3-openjdk-d5760f7cce54.tar.xz 337064 SHA256 887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921 SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e WHIRLPOOL e5477deaf846a1c78fba313ab6f5fdc2b053fccdad8d096d1e29eebfa33da2196243d6d77818d7d8fe78a69208578ba3ea42c6a683bf52208be81ea67dae7bd0
-DIST icedtea-3.3-shenandoah-24002f5b584e.tar.xz 6861392 SHA256 ddd945ebb130efcf36e4cfd0c18ab8f9cfda3c5cc4ef281ab512a558a63cd04c SHA512 9da5974cd0bf15d2687439ab3ca79465c0a13ee8487b691d0c97c9404ab9c70e0a3387e3800e797ce7a85d5d5f59fc6e29f0d3e001f3bc1382244ce5e795d411 WHIRLPOOL a5b9fa8b23f97a6c5db011af2d2fdc89e55d7faebf4dcd047a2434dd50b8f86659d6c17d162af2be01d8acf9268af8e46c8143e47907e47600c9e101346e3d0e
 DIST icedtea-3.3-shenandoah-d9a978177779.tar.xz 6866276 SHA256 0593a1105f0e1e59ec05298d608a2fa5d610a0e548e849ab013119f3b7a67229 SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f WHIRLPOOL 8e0681fb8e843f6d05a0e82883c574574676689fcb9876fadb712c0ee64bcf6b29f4240b156e57a3e9548e0600b8218e2f1e86418ae993b02ed6f192d323ef22
 DIST icedtea-3.3.0.tar.xz 1453792 SHA256 b764ff09674f9139f94dfe9df8f6393ed55af149c7bb1033fbf119f68cea750b SHA512 58f8fc80ba68d38cac797192af827d6da5a93e165a5c62b8dfe852f848bfd8cb851dfb3d5d2c7b79f60f2fdced985ba473102afc4a2d5a56d6ddf1f8bb7cf9c3 WHIRLPOOL a7615c8b3869b0860bbc6feb9a9fa54d1271cf3bf4689f5fb91b338f75963f64f0ac93e770dbf379f26bb3c438fdd9beb3e0f9e96e46c5bda1d8c2dccc4153c2
+DIST icedtea-3.4-corba-8eb9dd5fe2fb.tar.xz 940804 SHA256 19492bdd85166ce55d0f85f96e1d3d0b21e61f4604349ea0b94f6a0aa1388b61 SHA512 b1f44e1e41b3565bd45176f726e4d1c2999c5ff25a5f2e973f0e5836b7fd2cf6540eae83d3944b303677797e052abd950bb9748fb3e218e4c71b1ea059bf1209 WHIRLPOOL 35113a5283f3a36cd6b5d4022a187995fa75e7aad5b6517437af86e3314bb87d59f9805d0aa37d02650f12158d6088b54f0931e3b8ceea1722f9635b9fd0c0d2
+DIST icedtea-3.4-hotspot-6efaf77e82a1.tar.xz 6813884 SHA256 280f706bb0aaada0903e9e907811ea12bc1c216fdaeb2694910f3a99217f6e89 SHA512 8a593b1c9f022e7a3efa834c5547c59f1a2143f946edae2647a3368f9d4d39b9d473f36575d395e627e5bfac1f9cdef0efe607e0a81b40c46dca44ad6d59a65b WHIRLPOOL d6866b734102251a94367dc1a67e4f895f1efb96140438bbf0fb270c2a45325b8c97cab8d0d5ce696a8c19cb62af8f9f586ceef8e663de3743d54be47d90bf26
+DIST icedtea-3.4-jaxp-faf1c4a9a51d.tar.xz 2302792 SHA256 ba5933a2bbf04b0786fd5f046d43314f1b1b2bf2888c586521b37410783bccef SHA512 3addabc7478c8a443de5db5606b9eb71778484ed68943d3aa2b61c02bff993d3cb446333be7a5bfc90f8757d0125eb1f53f2483c60c79bb0f19e642e1696ddcd WHIRLPOOL 724e224e5974b01ff87f1319beced1b70ea65740989ab7d2c9e29d76e44d537cbde4f14c05bf3083d908fcdf58c336594bf12b0dab7569362ec687272ba21565
+DIST icedtea-3.4-jaxws-5f5237104669.tar.xz 2269396 SHA256 a443f3243978a87a055ab103468878e5e072706ab0c82d1949ba869fc63571b6 SHA512 1b83b0a90cf0c11220cae034d2f86ad51ff8f6d153dc22e8e9f65b8ec4de8f7148fd37356aa19098e6545967da3c53e87edac747adfa76e254c1fc9d31e4ec1b WHIRLPOOL cfd75b4209b3b654269b916697c09a3c537c80ba3c66721287ed9aa23bfb9691c563dc2371bacc9ba4dba0080212f86cfc7e5339b6c2d0e5d6e641e486bd54ab
+DIST icedtea-3.4-jdk-3642a826880b.tar.xz 38972276 SHA256 688e962ab13055eb6b8668bb48b50eecc7f02f5120b541cfa58f516f875f9f9d SHA512 60c932a057dc1869bec52ea73af2a21af9e622a196510d074c5d17c01bf7d98babd651f5577bafe96a832e6a54ded8704c4f7d964f0874edaf2222bdbe3c0c46 WHIRLPOOL 9a8dba06351e70e973e6f1fe01ac5aa4f3e8db4ff2c073df8ac0d88a94f65bd098fc2183bd76329df8cd248cef13170f0c986c9bd1a784fcd3f54b84c9290661
+DIST icedtea-3.4-langtools-d10a13bdc98c.tar.xz 2070432 SHA256 1b0b0fb49c81955573ce509e1801530faa6477e606192fec4b0f951904fb8ac0 SHA512 13065b54ca036ad11b8879d9ebaa725a823c25cda5b28f0092902bda2b8879cfd000d132916302f2661b63b03c0bec90d1adfe4863d38c201cfbdf74f1f942c6 WHIRLPOOL 257b6ac9ad6c515445f051b531f51524e3d34518686ff4c4f2fb416d26fde20746330499da9e41e545dc19fb398134c35b2080ee26e608c0b24e8fb25b1f3901
+DIST icedtea-3.4-nashorn-8c0fe384c4e7.tar.xz 2229336 SHA256 0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95 WHIRLPOOL 0e9421c077d617f2c67a67e590ad8e8322ebf33559a1f127efbcfaa1e30f3437bb8749d656fca211f4f848fcd98ebc5f41449a39499a9dadc64990d45fe000cd
+DIST icedtea-3.4-openjdk-d5760f7cce54.tar.xz 337064 SHA256 887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921 SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e WHIRLPOOL e5477deaf846a1c78fba313ab6f5fdc2b053fccdad8d096d1e29eebfa33da2196243d6d77818d7d8fe78a69208578ba3ea42c6a683bf52208be81ea67dae7bd0
+DIST icedtea-3.4-shenandoah-d9a978177779.tar.xz 6866276 SHA256 0593a1105f0e1e59ec05298d608a2fa5d610a0e548e849ab013119f3b7a67229 SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f WHIRLPOOL 8e0681fb8e843f6d05a0e82883c574574676689fcb9876fadb712c0ee64bcf6b29f4240b156e57a3e9548e0600b8218e2f1e86418ae993b02ed6f192d323ef22
 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.3.0_pre00.ebuild b/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild
index b2b1c5a8..4966d9c5 100644
--- a/dev-java/icedtea/icedtea-3.3.0_pre00.ebuild
+++ b/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild
@@ -17,15 +17,15 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="9d3757e6da35.tar.xz"
-JAXP_TARBALL="81c2773fbb0d.tar.xz"
-JAXWS_TARBALL="f57f3ddddff6.tar.xz"
-JDK_TARBALL="0cc71de3df18.tar.xz"
-LANGTOOLS_TARBALL="a553c153d376.tar.xz"
-OPENJDK_TARBALL="200203ccf4bb.tar.xz"
-NASHORN_TARBALL="0fb33c8b64d1.tar.xz"
-HOTSPOT_TARBALL="be4aeaa327f7.tar.xz"
-SHENANDOAH_TARBALL="24002f5b584e.tar.xz"
+CORBA_TARBALL="8eb9dd5fe2fb.tar.xz"
+JAXP_TARBALL="faf1c4a9a51d.tar.xz"
+JAXWS_TARBALL="5f5237104669.tar.xz"
+JDK_TARBALL="3642a826880b.tar.xz"
+LANGTOOLS_TARBALL="d10a13bdc98c.tar.xz"
+OPENJDK_TARBALL="d5760f7cce54.tar.xz"
+NASHORN_TARBALL="8c0fe384c4e7.tar.xz"
+HOTSPOT_TARBALL="6efaf77e82a1.tar.xz"
+SHENANDOAH_TARBALL="d9a978177779.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -66,8 +66,8 @@ EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}"
 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=""
 
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt infinality
-	jamvm +jbootstrap libressl nsplugin pax_kernel
+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 )"
@@ -96,16 +96,15 @@ X_DEPEND="
 	x11-proto/xproto"
 
 # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-# Kerberos will be added following PR1537
 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=
-	!infinality? ( >=media-libs/freetype-2.5.3:2= )
-	infinality? ( <media-libs/freetype-2.6.4:2=[infinality] )
+	kerberos? ( virtual/krb5 )
 	sctp? ( net-misc/lksctp-tools )
 	smartcard? ( sys-apps/pcsc-lite )
 	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
@@ -314,12 +313,16 @@ src_configure() {
 		--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 infinality) \
+		$(use_enable kerberos system-kerberos) \
 		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable pch precompiled-headers) \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
 		$(use_enable sunec) \
 		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
 }