Version bump to 1.7.0.60; fixes bug #511714, reported by Robert Forsman.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

9 files changed, 600 insertions, 19 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index e53f3b3f5885..ef58e401d1b8 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.102 2014/05/23 13:26:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.103 2014/05/28 19:07:30 tomwij Exp $
+
+*java-sdk-docs-1.7.0.60 (28 May 2014)
+
+  28 May 2014; Tom Wijsman <TomWij@gentoo.org> +java-sdk-docs-1.7.0.60.ebuild:
+  Version bump to 1.7.0.60; fixes bug #511714, reported by Robert Forsman.
 
   23 May 2014; Manuel Rüger <mrueg@gentoo.org> java-sdk-docs-1.7.0.55.ebuild:
   Add ~arm keyword.
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index ba88888ae342..3661d707e5dd 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
 DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 SHA256 6e115142c3cf5627f9a378934bf3b807e72c2b979385019d5f23e79019727937
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
 DIST jdk-7u25-apidocs.zip 60766618 SHA256 fe99e1b909a9d877fb30c49732a2dcc0a1cc310517073016489750cf04600377 SHA512 21dbebcee94f9a8125d11959c855f8eabee4e25135370dc6a99e5d60bd56f5847c89cb1e5928de65148651034b69b93493f4d20063010d0450d4ed6db7d771e4 WHIRLPOOL cd9fdf16367fd2b3248a8403cebef5b61d529ea0aea8e67208a4a6e111bdcfc923743fbb4aa624bf59c8d29289897d82b9c08d7de795a328f3ad8e8271e50a48
 DIST jdk-7u51-apidocs.zip 61116819 SHA256 01f567699e9152009505cefa7267b7ac68138aaf1c9d85f16155f2ab30c2bec4 SHA512 31bbe1ef7c48fab381063a937b14b296147d1045a8b41c4cedc4c130965af746cea41e1ee91117fec3b20c1fc04e5917a4c97f1329f01675441f224794213bc3 WHIRLPOOL 7347efb5a36b7de81f2685a3e335e5af92d168c90fd85ced18591bc2fcb8a1e427ccd5ad1726434e420674e27c041d0113960a3ba533546235b529e92ccfe061
 DIST jdk-7u55-apidocs.zip 61123597 SHA256 f5c5a7cc33c45e5b7442076465c5a934bf44d006cdfcff080d7ed00bdf5845e4 SHA512 a7c38a0882aa694552ceb7e50162b75ab2bdcfcaddd0d4f1a730f4fdf70fe55d92076ec237ae756aa7ba7ae62d57d0e0b2e6caee8db6a1864316ceb247dfc5db WHIRLPOOL f2f751fcdb4a2a324c75b1697be526404829d9a4dee7e9a7d8923ebb3c97a51a80d49edaec3c48c3c50f1c8c6992467fc334d307b1667903b4755de78131f11f
+DIST jdk-7u60-apidocs.zip 61152728 SHA256 6dffd325e1d1f28cda64a84c42adad14f1bfc8220471494dac14badf275cdb88 SHA512 aa13c96cab29705be47d533e6d51d1b01806b7e56e9f18e616f218dd524c9b36f47b977d7676bc6d0ecfded29ca9993e3dcadf5e86da35faf32c8e2fce66f1fa WHIRLPOOL 4cdec3412d5504843f306176d4572315ec7dea21cd6a9281405bf11a87145465f877a01f840ba84d2a06ac140fb13ff06aeeef374445ee81604e2f6204e98789
 DIST jdk-8-apidocs.zip 88317932 SHA256 3de88cc21051c3a2e94a7def9e937208fec94ed1423dcf7611e26b8a28f00b45 SHA512 2edda9d73ad23e64abbdb5b2363342dc1542d49f04614fac36f5bbec29109e51dfdcec970dad68da7ced75584109c6d29b62c16c37fcce86a504560d2524a45d WHIRLPOOL c013e840759df220686e73d118dd7abf94ff1c1a8d37576f1023d3baac49c724769ade56d62af87a48da308b0fcad97be99a2842f4fc08b11ed9844d808f9b58
 DIST jdk-8u5-apidocs.zip 88441146 SHA256 89696b9d189066b08ef956345998bc12d0b5a6bea39f22000b7f374afe76f6fe SHA512 f1fc0b194a4e6bfd6e1c2bebb9d1ac066945d32eb0112b521372f2ff440b613fd39d8d357c08f66c5b328346fc09e86ea6758c50c62d9dff355f4500521cd0b5 WHIRLPOOL 5a2215d0a2d067d409bfef8c364c680550be0cb0860cd6b52f4269d22304384ad98c9e807eec66f379e4871ed514d3c68e227a019e801cfe30543fe55b36e80f
 EBUILD java-sdk-docs-1.5.0-r1.ebuild 1586 SHA256 e36befc28935b01a628d745f40bd342819643b6b9ea281c75fb80305783bc87e SHA512 ec4be077de6377c425f7daa334cb0520f638f0e720c98a85722af994534e96fc47333ee8b6106eea7984ab1f52f58fe8c6773752c9aee102cecb407263fba14f WHIRLPOOL 496aa76d5790c1d8f9ef6c280d26412a3f4dc03076e7f0efb494f2a82a76b915437c5bae325ece24ac0da74c79d927ad8105d2d30ba1ffd74a7674e842ec629a
@@ -12,7 +16,19 @@ EBUILD java-sdk-docs-1.6.0.30.ebuild 1564 SHA256 389c2cd0367d619a2ea660b5b5a9c5e
 EBUILD java-sdk-docs-1.7.0.25.ebuild 1471 SHA256 04a3b6984cef6617df0f85affa0c6e74517b400e7f4b19af6b8d4cffdcba99ff SHA512 4efe44613bf21b96de8f54e5bd21c04c072769701a457e52b1a218a2fd49fe1a0ee1628b742def4bba171f0e8cc909cabbf46b0e8c9f08355b3e7ccfe3a61902 WHIRLPOOL b88986360bf064c0960cb74da9337072cbcdcc6fda8db7ca87b620cf14c5aa8ce89d6dff56dcc19024f9578b108d6c28a8b0a794bb66e803a553eb1d0c6b01d8
 EBUILD java-sdk-docs-1.7.0.51.ebuild 1475 SHA256 aa4d631eb4dacb416b4447a30434ff6870482904cd9dfa25661a230e0a555dc5 SHA512 735c371b9c22fe24dc7560457ccfea87d068b7e70a78af121b925eef3d7455cc2e7156a86e797cebec04ebb9b5e345a7106ca93a5ea9f392c9da58fec200e2f9 WHIRLPOOL 9a6b02aedfb1b08bd8d425765806ee34c18428d16687855ccee36214b478b905e528fb476070182e61da7a22b55764fc0c95853f651e7a04b3e856fab1065050
 EBUILD java-sdk-docs-1.7.0.55.ebuild 1479 SHA256 00b2cc90793664c7b6252e1889f2fe6eb853ccb2c45e03661d5061c473cc91e5 SHA512 2fefc96fd3c80be5f30e410d146808ad937ed9373a6b518e3c87a51ee7ed799177b29b2778ca4bb91d82fd75cf1094de0ef069f3770c80de820e8c70af05c49a WHIRLPOOL a90aeb6c66a6fca8f91fdd2a97822744f665bef7e03191226a3881624e592304a44cd0464be650bfb1a7aab579d6b0503b6e9c4621fb8dcb4ff7376600872157
+EBUILD java-sdk-docs-1.7.0.60.ebuild 1480 SHA256 8d413fa1bf3553963e854e3ef7f92365fe9161b7efba46054f2b79173286b17b SHA512 dee15afe435b6eca547292102fcd6c2e63f9d3fc60138d2c82e98939712196fb0e51f40254eb8fe1731916a04ffd06b970dd23869ed9d22b51712b9fabf4136c WHIRLPOOL 18354a0248a5f5dfdd2f90dfa47f0f7027d462e4003b1087805aaeeb342d94227665de06d26645ec08deb42f08857f282fb2ee915ee6ca7edd503cf3dde83dda
 EBUILD java-sdk-docs-1.8.0.0.ebuild 1594 SHA256 56fccaddd933c3201e888d83d806f9aba561bbbda3465e71d9ddc8ff1709d405 SHA512 bd04a31a56c5d0ad184b4ba061862614a8b0ed6a2f4fdf7f7cf324a2b9795a7636436cdcb32cd7add369f0086270d8e6187e11d4bd58855d1d45a778c995c154 WHIRLPOOL 8e334e1e0d905d69b953d4c0d1d22d364d44b833a3d95b973e8ec4120efd07c2fd11f197a8ed5f79af5c8718cde2fa854cadc9b6fb47620f03774695ff868ae4
 EBUILD java-sdk-docs-1.8.0.5.ebuild 1594 SHA256 f2805916b8bcc699c2f3598900e5ef74415f6bc2744a265a8610c470a814d366 SHA512 931ffdd906f9b55304157b5b66f48f0711454feb6d27e866e6d8180f4c2d5e5c7885393a4350ec8cb6e3bf2fcdcc878137f56446c743780111f1fc6b995f7075 WHIRLPOOL 308dce152b4e1b6d3c61486fd52bb54b27734af402d308a94f1f1a48ee2cea2db3e5b289fb2409035257af2417fe2c1a077ff38c463e6f69b800bb0962d9d6bc
-MISC ChangeLog 15383 SHA256 bc239cc8a77c00f34b493c56cb88c4de8b96e4bc56dad8034dbba3b223a6da50 SHA512 fe0d35621a518aa27006a6df9be81de5e9cb1dd2e0ceba4641d5d69d60a29293934b07cc3ff1c67eb8c8e57a9b3709288753178c4d31d4433f3a5a80c8001597 WHIRLPOOL 2b2ecca6ac925beaf852c101fd6db3b7d93ed30df98589d57b86b3e1ca9f40b5a186faf78953d5e5f95af9f627b30fb8fffa2fd372b47f147c4937e99f9211a4
+MISC ChangeLog 15578 SHA256 37127a3f5849a6a568cfd5cf3b345a2ce82dcaedf2afa1111ac4f3ed77a14b6b SHA512 58578c94a44f61b54a7f8dfe6471af5a3ca4da004944e2ae7555cdf8b9984cd0661bc344a635befcf96c366fcf21467ef226db9dc94d9c8aabeabec53a320f2b WHIRLPOOL b723507defdd1e9df0d554345a4649bda73ff95e44ead0e5248520d9b104fef11eb3304fb5cb07f2bfa94671a4ad58612d97638f20aca288d4a5e1da1529beaf
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJThjPOAAoJEJWyH81tNOV90AgH/jWbAVy591RB5RlqizCGGoy6
+w/RDuDCVtAkawFyrEeuP/B3tqORLO4yZ6LKDRfdLV+HsQJHIBvBKuucZU5P9uW/t
+X2bXiKJ/ctTAE7QblpurmcveDVZEyAQF0q7meL9obyGXaauD8hU9izAo8ZEc8eVE
+B1HpkhYeBbV0Kg3eLAmdwV4DcbFjYRw9Zm6U0KSsN1VjG3c86yjqi1y8TMbXNPBr
+ZeimkFgZld0xK49nNC02syWQSLxb0zgphEbEPKZM5CwYbX0QI8PKwGo0kI7tO1Lj
+ZFGqYl/hPm/t5cZgOxEnZfLKQTn8R/ZHpo7HaoMnh20KuQ07HHGafX0Ewq18pRQ=
+=QCqY
+-----END PGP SIGNATURE-----
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
new file mode 100644
index 000000000000..f574de9e78cb
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild,v 1.1 2014/05/28 19:07:30 tomwij Exp $
+
+EAPI=5
+
+inherit versionator
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
+ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+SRC_URI="${ORIG_NAME}"
+
+LICENSE="oracle-java-documentation-7"
+SLOT="1.7"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	einfo "If emerge fails because of a checksum error it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install(){
+	insinto /usr/share/doc/${P}/html
+	doins index.html
+
+	for i in *; do
+		[[ -d $i ]] && doins -r $i
+	done
+}
diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 66a4d6646391..600da06e8c15 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.60 2014/05/23 13:26:51 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.61 2014/05/28 19:07:20 tomwij Exp $
+
+*oracle-jdk-bin-1.7.0.60 (28 May 2014)
+
+  28 May 2014; Tom Wijsman <TomWij@gentoo.org> +oracle-jdk-bin-1.7.0.60.ebuild:
+  Version bump to 1.7.0.60; fixes bug #511714, reported by Robert Forsman.
 
   23 May 2014; Manuel Rüger <mrueg@gentoo.org> oracle-jdk-bin-1.7.0.55.ebuild:
   Add ~arm keyword. Fix bug #467168. Acked by ercpe.
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 9c0be441ac79..dec3bccca575 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a
 AUX oracle-jdk-bin-1.8.env 1000 SHA256 1cc01fea09be2b333bac21b753a46458cfcaf92f08f13a685507d8331ff23027 SHA512 79ea850df8bd655b03ade0f1b068cdfa48425b58bb16f8f34013076754af19e2058a1800f17c96de51d2713b84ed326aaaacd806766d611d32edf9f7a9a9d942 WHIRLPOOL 2cdcb4c926ca342dcdcfa7765491f88f1681c0f3a4592fbe74e4c9a332faccadd20db0fbb8dcb0782bd767400515a2c5b156455358fe0c65ee58e94a9f72e3d2
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
 DIST javafx_samples-2_2_55-linux.zip 21220786 SHA256 4e46b3c7e2cebc31fe5127f384fa2377a79db9b2a02322252bcd2a6bf9da833a SHA512 55ec3f5a86658c1e81aac29041461c053093a327599c754b95a42c64af0401370acd1d9199557eac99797852bc248b0552c8d3ceb9bb20567cefceb45d1f768d WHIRLPOOL 07e99ecf46d7145d96da5894b18855afe0566373717922b4071108df8112f8ffc70482e423eae687d8ba482f252702db9a063e137be87153245f169921c8d06e
+DIST javafx_samples-2_2_60-linux.zip 21220772 SHA256 4963394cfdc7bc47b693353a5957a1d3b86dfff800d8d2a725a596090d7c9def SHA512 8347a7b20c8260379eceb2950d384ebfdf542df595eda18ec0e57e92b35393df37815340858a8c64d9422741331c443c5bc096b03f067a4d0cb50ec0c0d70760 WHIRLPOOL 2d84ceda852567cbfbff617181603ef8e162effaa15afeafeb756d05b831a97963817a8594a2551b0c465a756fbd9234864f79371b824fc2634f1f7bf50f6ae9
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 DIST jdk-7u55-linux-arm-vfp-hflt-demos.tar.gz 10395595 SHA256 5ee84c53c926c4d689ee586ca458a56079d1a5684294ba0bef5848532faac173 SHA512 bb675f7de5b3c76918fe361eeb500bd8376da5ad2e9e0055df0a4d3ccadfc63685eaec3f43a9fd5eb63a0017c4f24a391154eb88fdd4043508e0da2e0de49fd9 WHIRLPOOL 726a11c169b5c5cbfff2433bafafb4800f1350b1f108538f55278b627148540d24c2608533a42b03173fe70e953016d2bb6f1e766482b007d438507c8f5af8db
 DIST jdk-7u55-linux-arm-vfp-hflt.tar.gz 71041220 SHA256 519c99395ba08f0e1e6085a00a46c6866493d7292f90f07a5e289b7f2d41ca7d SHA512 749c5321ef97858c61158d8d0701a476ec7833a3e0035cb285fb2eceb3835df54424b59b94caea81204ead33f27d55f6fbabcab42be3ef4fcff2fe76f32eb110 WHIRLPOOL ffe75067b6cd6fa3a9cccf703c05853fe9d1f6084f40b80a1384c9116dacc01fad1faa788d6f02c79ff9749a122fc8e11b86ad63b7cdd243f47c142d401b6a76
@@ -22,6 +26,20 @@ DIST jdk-7u55-solaris-sparcv9-demos.tar.gz 906509 SHA256 86baaf4ea805b520cf77950
 DIST jdk-7u55-solaris-sparcv9.tar.gz 19231896 SHA256 82d07fe5a7578268049d5908e880b75b17100e1ee1a5bea4f4a4b355c2f4a64e SHA512 4c999f6b5a50fc838565fd8cc18057c88bb589bcd3f5724bb4c4574d96df1d99a5e2918d2b5b37905a38567b1eddf06270a7d4ecc69ac64b2623f9ef86952e0e WHIRLPOOL 56049985fca0bf934451264897621f5a300d8b804daf0a869a7dd3e290306b168e4428cca7c0f74a9631f635161b86d1ac75dc626e691922bdd23eb572065d78
 DIST jdk-7u55-solaris-x64-demos.tar.gz 864990 SHA256 0e2539c2bbdc04f3990ead9f115e7375779c44d5d82deb559f738be7b39988a5 SHA512 04f95d2664af961253696e33d64a9f24eb3332d9f3d44b0f68ce57c9eac7e49ec3913a5a704810101ada45185a07a0ea424be0d4c7b9314c37ef11c70507799d WHIRLPOOL 7ee0bc46abf7201d501368fc31892751a7444b6017df735cbbc5247dfa6352a5377d320dc420224c18aafcba3db03be7a04c645d6f017c60c26e0babd9a7f752
 DIST jdk-7u55-solaris-x64.tar.gz 17039750 SHA256 42b46af5767803c60038063c534a346fcf7bfe756c6a867dcf55c36f89b1be5d SHA512 116d284561a3dfe0b0e5aebbd7d999467cf64c6a96de60f2654aa595dcbe4bd3e234f9c5806bfc7a71f67ac6bca37fb6d1b0bf2d551e0299ccd06c8346294c10 WHIRLPOOL ab642a352667d63b8a0bc227affc282a23c7796d94fe149d11818fca73a9316da92c606c4ad8dc537463aa6dc71eac16f83ae2dcd560c857069ee89bd4384db1
+DIST jdk-7u60-linux-i586-demos.tar.gz 21177426 SHA256 b06ed999dd4e2b414127b9379b90582718be0cb4f3d69f1e802aa3fcc4620f47 SHA512 40d71dc4be97a24c464674dbcb72c01a2440431d380bd46935e879ea1d0670d717a5d33be072b0228d33a56d9ea4b5f1cbf42e01e3fb45a45db5ba7e2e24c1d3 WHIRLPOOL 4592956a1a0fcebfe2e6fe804c710781ff12a93386585561a85f5895414b2f8703d80fca48fa7dc3a12d521d0ac941450aa6551ccc3106a0441540d539e504b8
+DIST jdk-7u60-linux-i586.tar.gz 143607445 SHA256 d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48 SHA512 18eb2360c20b27ed125d3ec67258e944b6ea92e7768d1b71c265a4c09a99e1ce32f66ffd044491cd84edc8ecd67da63bc24c4bdfaf40df3fc70d87c8dcf67ffe WHIRLPOOL e1d493c35c1ce9e0990a66045ac96c35fc6e2acd4d9b3c38280edbe1ba0c8eb374d590bb63e1a811743c7d0982ff2aaf36e3d3f72dbcdf2a6fac73497041b138
+DIST jdk-7u60-linux-x64-demos.tar.gz 21231506 SHA256 4d85fd581083c19d8805ce28b90856e43242ba92d9573ad43dffeb4725fab794 SHA512 ac3b3ee3ded1bcb5d3989f54903c6979e4aa3ec386cabb30fcb52cc1a1774f11dc68f027fdcd9231835145983c084d858aedca580009c3a985604821cde474b7 WHIRLPOOL 11934ca1c327a4ade533b0479b800da6ac33b37605596c57c14eb8293635380a8a32835bbbeaf0d2654b1775cbbfab375579922926ccdaed406151e5734c1671
+DIST jdk-7u60-linux-x64.tar.gz 142362384 SHA256 c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8 SHA512 1a1398fd1da78237fd4728793e54545949d510e3b5a273f33d17ac6cedf29ae56edd22eb80c1696b4622519be7eec45a28949493ba924c555c0e6d34aa67a5c2 WHIRLPOOL 096ea206cdbc74c50eb1175ed12e0476f187c29df76c0ba896a10b441a931810acc31940093e7b0bd2c7624556ea0c9a2fec98e226542c92326851dfdd60b883
+DIST jdk-7u60-macosx-x64.dmg 194971949 SHA256 a868aab818cd114f652252ded5b159b5c47beb1a0a074cdb0e475ed79826c9df SHA512 6a5a2c92b31ccd5fe36337718fce332d97e176ae603392971421329f798418880a950d59c19c0cb1e16c16382f4dac645dcd78fe56241c80cd15799d6f0ee5e2 WHIRLPOOL c30d6f8c50b96faf582c060659017d694a208099c0462bd49e2de4ba306d36079ecc3180df581d0b268da5f0cd91490b2a6613632ccefe754aa0bf4eefce7a30
+DIST jdk-7u60-macosx-x86_64-demos.tar.gz 19833379 SHA256 a8730528c32d3fe63f70ecae5112720842a1ce8e6af886899a52ded40aed8195 SHA512 23ea3b1e34877e8ac60d5da49981a4f68fd0db20c5e1738d6c12466d823c0dcdcb2da7ac29d8ac8ebc5d9202d8673eec8d388e4d453548df5ad77cd135162f55 WHIRLPOOL 9006e619990bb269effed8d7e206dfcd2cf73a85e1707ae45c25f0b72631b3d95e137838045d7df3daa590067fc489c66564590e64b4e61c394f26a490528d45
+DIST jdk-7u60-solaris-i586-demos.tar.gz 16769581 SHA256 59c9b617e4bff0efe5e536a308b1e9b6a972000f389149aecc5e8726b3beec74 SHA512 daa8e21ae82cd8e8149d07246495691a4b5ea54a1709657eacb25485d9961abfe0a357a7097a83ab756e39b96fdcce8f3642a8f7c4408455f83f4fac07acde01 WHIRLPOOL 42d3211d428ecfd41a14a0a90989ee389f1c6a18b96f0a7db465f3dd7b459a88cfd906b7190e11de7fbc69e5e293a786618a781d0815ba4065f229206af715b4
+DIST jdk-7u60-solaris-i586.tar.gz 100143980 SHA256 0681fc539965f0d9e35c8aa29f7c04a1583e48f073b5c264632a5f013aab3510 SHA512 fe75df42557eef1da551908f435475ff0ce5a83a0eff68f27cceb0d5c070ef6963a40c94ad53aa714a8fb1b982fd874aa34ad62acf2ac13df547b9b9190846d1 WHIRLPOOL 0d9ab14f6dc9d21d4bb19f5ea842de4322c8a85773a4b94f4798459077e91c551503149bae3870a3fd5d71b9c9d5d720ff505972cb851df9c6ac8820685b7217
+DIST jdk-7u60-solaris-sparc-demos.tar.gz 16758671 SHA256 afb973eeeff5cec5d742dbf52908413d31df5c4aebf3c4e0772dd672449afef0 SHA512 282bdcee11bdd37db94def6a74e86fd6e29c6df17b6df2b73b431d8bd74806a5bdd07d59f2474c81ab0d9cc6a84db86031689f9c94b3b07d4ea2ed256dde0c30 WHIRLPOOL b1abb7d21676c4427cf48af697eb27270d1ea8211b5b3ab0398556d41c7280d3f9828378d2405314fda08c9a17e26e3038f83d540261311f4654f9fcd4d79f68
+DIST jdk-7u60-solaris-sparc.tar.gz 103353391 SHA256 ecb7376d17313aaf2f3682a24585664f3262fb3ef059004355f92c338c21d656 SHA512 e8c65d4df6d636317021bef2195f074341291e33be34624149b8a13322f404f9bec805fddb73cbc65f4d10d3b8bd1410a5dabe07c4c1b06d889a92afb18a6a60 WHIRLPOOL 5372d5f2c71e4a227940985534e6efad615b90b5ab5231332ec9f5f65a742b3c81f98b05d63063f646689ffc97cd0809c62fdf1130fadbc96ae922b5e4681846
+DIST jdk-7u60-solaris-sparcv9-demos.tar.gz 905717 SHA256 4b3a6bc11b198186061523293cfb438cff70fa2a76186a6a44063cd01e4dd730 SHA512 ccf2cec9a2cc89d20cd3f0e9cdf1e8ae80e1a1919a26284509d58a5cb458e22d04b9b56ed92ea4cf54fa4ea144b77d66726abc52a4e76809eec5c12d060772ef WHIRLPOOL 0b54e62600086310066b0abde3d7fdc2396648d1a77248e29f77a083fb0f111ac4bba2583c8b47b5e88a041c06002d5e360c6d41cc5896ddff4d72a6f8f38e98
+DIST jdk-7u60-solaris-sparcv9.tar.gz 19291928 SHA256 709d2cf1ce7d9aad674561182bbf8aee6a8f53040d90e582b04333389c5d1fc3 SHA512 3f46b056e55cd7adafa3585c1aa8ccb90dca9b16377c08ae207c9c7f3ac63621477f372515819b300b6ee785b2f73d38c673c3c0d82d16969f8089f1d0c53c2f WHIRLPOOL bfdcdbcf9d1da435aa97ad4630395e1780b1957c52d4df6c86f168e9a903c514ab380615ab46ec86e07b6a00c0f94f6e1783815ab8da3d108da4b0f8f7bea409
+DIST jdk-7u60-solaris-x64-demos.tar.gz 865227 SHA256 ae6e627b381615ae117f756117bf535ab6298bb04d181c597bc6566e19b4c7bf SHA512 27125b66f0d55cafbac1b02384dce2491dcd8a8f3eb24bc3eaec3612bf237d6c4b3d814d9d98de1e0c3a123e586029a81ef3058c577ad61785baa9120a69ea17 WHIRLPOOL 15a02786a8e12f1f5e761f784fc3693d86387848569057d248fb37403e05edd43941f1f50025a03feb0b454ef2f8bf5c8ddf5133081910b8bd673d601e03fb2f
+DIST jdk-7u60-solaris-x64.tar.gz 17140189 SHA256 8c75a6ba14bf446a9707619c364ea544e983a91fdce9b41e75ca5f33f75c9278 SHA512 db6d9dde2e73a8348e667bfc666cc2c1a052d307440b3c4b5f7b0c0c0568212376d92d57ea8432bd2f4b8e0d82550e9b8b18632685f7b8c8c0eb702543b06cae WHIRLPOOL 810fc3eca4f6ae9f81812d8b26864096be8d7c5f78f88708dbba03de0b0b5199eefd9d15a90bcc3aac1338094804eed3205ef28a8847912c34c4710152aa5093
 DIST jdk-8u5-linux-i586-demos.tar.gz 55210712 SHA256 9e7bce701b6f9f3ed07ffba9f3208141c794bd81c6f28e62f3faadf68944b3af SHA512 63e24f21cabdf47895ba56ffc7b1c6b67689af72d5e1c1e3af5cc9c4a63f4f4ddd67fa6f2ec92709010621b90c0fc2a7dda60feab4579a19c19f28ac2c9f7e74 WHIRLPOOL edd7d8ad0ceda1a77722569b7ff671235522c8d44366fc470c760f76539f570fc311704f1d724e885eed06814431f4dcbaea9bd23257bc1b2c3b8a17683e99f6
 DIST jdk-8u5-linux-i586.tar.gz 159910666 SHA256 779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9 SHA512 fa120875284539c0f593012cecf984dd7e7eb9745f78fc2c3d83b87d189fd258747b219d14b38bde0575fbb6e58088a882dc3e0e5427e77e74655aab0495726f WHIRLPOOL 02a99cd993cab6a46d80e3e2a9115d9ed0a83c1b7243182f4363305ccd847c4f450427a1a415721a190ca22de6b7a58f41bee06d8608699fff31cc8d486a1f8a
 DIST jdk-8u5-linux-x64-demos.tar.gz 55258871 SHA256 129cb22f0a931bec3904dc1927d96aa8f486c4adf009d533eda8aaf3fe703bcb SHA512 2d03b948cca7d5815d627fa0b3afa24724071adff0b59b1c4f3e3c1d54a5576b435c05378384ac4e8c8553935522da446997375799aa7ae9f880d98ebbb78ca3 WHIRLPOOL 8802fd0ce34c9e8d2884a039d3e92567bd17ea8902f51ee0974e120bf0359640e497a7f05f929f63623f2065769aed58fc32bb37a3f5a724084ff8fc992931b0
@@ -33,6 +51,18 @@ DIST jdk-8u5-solaris-sparcv9.tar.gz 100180279 SHA256 22b5f8e476376229a29f376e2de
 DIST jdk-8u5-solaris-x64-demos.tar.gz 8643049 SHA256 c9355b5ff54a0c84213d2ca524dcf6c163b176c099ddd0b3658709d863b14ff5 SHA512 30463fb317152b2239ca75a0c840deaeee6600a72753817a8d0f613b2845a5bd7912ce4d47df0f9ff746ecb64a20eac39b4470b7721df65ca612c61873777320 WHIRLPOOL a041e73f6e41e7f6c5a59fb1dd55c45cabc10d98b0ebbdf2635f78d2c747dea87cfb903234f1333b8248e4ee1f4d5a1e5fb3240e6ab6d7e97f8ea2d2b7854bcd
 DIST jdk-8u5-solaris-x64.tar.gz 97716860 SHA256 fa8138a46d82b2dad2b17a57ecf30fe59eb15a1482a07852a2a60a9f63da7538 SHA512 5e05a59f0a205c9f6ff0d0ab507d930e45f15418018ef1bad7d3d0d7626a0f12bdc8f5c83d80a4b0f1f755c32d92b81e69552cbfdb869d05ab82bda9fdfd9971 WHIRLPOOL a3741c2684780876e44fcdd9c977062db34137f4708aa9b0a7c23e3b07297455ece69d96564de29ad44d1a5440599b07107f05008c6841f302a9605ae4944400
 EBUILD oracle-jdk-bin-1.7.0.55.ebuild 10022 SHA256 8fcc58b67d2452b5ba1c616ade70aab0bb2d84cd3b8378d3d28d72b367279f1b SHA512 c803bd5a3ddeb2412493cc1b29ced3853c7b727b22c4e76ecf1e310ef745b760bb987d31be1be81dd559bfe2c79c63df44166ad09537f9be2a1631cf26a3e813 WHIRLPOOL 4fbce385b15d6b7b5a9bbe9c28f1833ba34fa8cf65e2dfb731a9d86f7fecdcd481aa51efd8849f23f1b4a39deb96dad9199d030325c4a8e54e71396953513cbc
+EBUILD oracle-jdk-bin-1.7.0.60.ebuild 10012 SHA256 81045d50ff419279bb26d8d593167ab628daa73ac1177089c3d3bb73bce24599 SHA512 9ddf7b63a24ae8f99a2d1864b76bb8ed5f3b6b71a2061d03fb5f26bba906431fa10ae9c5e0ad22a3df9ec31da32f72453fc2ab0cb170be439e06d92b65e5b140 WHIRLPOOL adfa32278211d5c1b998837085a35a3439580c0642bccf543f562348c5a26d5d5d9895a0b8470132f3dbc48f76e555acc511c71f8d602291a9c83b98e9fe6a0a
 EBUILD oracle-jdk-bin-1.8.0.5.ebuild 9855 SHA256 0a5c93c52813f395191b2bee8b05ec1bfa8e3b5285823b49b8a9264528793e27 SHA512 15ec250d6232d6f294a208ee0a242efee1ffef77672a395e5c1ae1d66fd40fbd9d094dfde6be1adc6dd8e62d7f744a8f055be6cb3f8a218b7c2a558250c01ed8 WHIRLPOOL fbb973daae5fe282e237a059138852540ff784e707ce62d9a9d65beae97d869da6f5808fc4ac41fc9c4472e465e14d7880bb491a13f29c16633381d11664f47c
-MISC ChangeLog 10839 SHA256 b712e4541b5220fc9f5fad2a63352e422debdcb9e230f3587a68cebc645fbf27 SHA512 baf9dbcac4500b5ae29e6fcec11db7e0b05b71f793a937a5dec11bf8287c451a06ee244a1894820bb300f76f90914b0abc2f6abebfcd5aa73920467dddf261fa WHIRLPOOL bf130a2f031e510d1257bed56dea075ae46f9ea9ab68b87cde93734d2b489e6928a9bfeeff4aaac49c28ee473d894a49ac931afa4bdb4885c637142f6dd12e7a
+MISC ChangeLog 11036 SHA256 ac251659cc56c51d9c6da92a647788aa420f70afde2e40a494ce24d615a3cbad SHA512 1b00fbd11ab98e187bec72239bc476c2fb60ea82b2d594ac7ede62f567a103bdbf73ccd50616a213c7f58e389005e853ac44df1d373ecdbd48f2af6c81aa8967 WHIRLPOOL dd1e0c0a259f84df9b48484f34a8452cac42f015cfc74760218bdc7a8c91d9f8b5b9ef64de77b2058ca456ee261b2ed238582b6fee89434aad433705f50a7e7d
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJThjPFAAoJEJWyH81tNOV9zoEH+wWkwNOj9FXiqvyS9ShL04AJ
+znuZ8fKBecugSmGIC6KRYL6mC/1Vg4AZFhz4wOsfPmOAF6enwuq28PJ7yPhvJ63c
+2QKNpVfiL2mW0v0iDVrFdiffpDX3gJ1EF3athf3qBVJqiZQRKUGS7rjMPeQi9N9t
+QYiojSm6PImpMPS1oxDzjJlkV5o5GHqTxvGTKHMEqtAae4cQDoIYEwLvDIf/h2vz
+MLMzeECC2UrHOmYWvzReRsKO65JaNY4ASmKXwvafpVIkpvj+1KJ/1vdNn8SsVoU6
+x80Yo7GFZHncOFD7CjmbSuqHx4cW6XZOuW9XnkV4/8cB+PvnuPPTNNQuHi3Zo2c=
+=rhSm
+-----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
new file mode 100644
index 000000000000..ac18069dd3e9
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.1 2014/05/28 19:07:20 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) # arm
+FX_VERSION="2_2_60"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
+AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
+AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
+
+DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
+DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
+DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
+DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ("
+	SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? ( !aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	) )
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	jce? ( app-arch/unzip )
+	examples? ( kernel_linux? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}"/jdk${S_PV}
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}"; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]]; then
+		if [[ -z ${_check_tarballs_available_once} ]]; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	# Special case for ARM soft VS hard float.
+	if use arm ; then
+		if [[ ${CHOST} == *-hardfloat-* ]] ; then
+			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
+		else
+			unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+		fi
+		use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
+		use jce && unpack ${JCE_FILE}
+	elif use x86-macos || use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
+		mv Contents/Home "${S}"
+		popd > /dev/null
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			bin/java -client -Xshare:dump || die
+			bin/java -server -Xshare:dump || die
+			;;
+		*)
+			bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby; then
+		cp -pPR db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		cp -pPR demo sample "${ddest}" || die
+		if use kernel_linux; then
+			cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+				"${ddest}"/javafx-samples || die
+		fi
+	fi
+
+	if use jce; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use !x86-macos && use !x64-macos ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x86-macos || use x64-macos ; then
+		# fix misc install_name issues
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+				libJObjC libdecora-sse libglass libjavafx-{font,iio} \
+				libjfxmedia libjfxwebkit libprism-es2 ;
+		do
+			lib=${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 3c5d6248bb1e..bc57709a1c5e 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.54 2014/04/17 08:15:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.55 2014/05/28 19:07:26 tomwij Exp $
+
+*oracle-jre-bin-1.7.0.60 (28 May 2014)
+
+  28 May 2014; Tom Wijsman <TomWij@gentoo.org> +oracle-jre-bin-1.7.0.60.ebuild:
+  Version bump to 1.7.0.60; fixes bug #511714, reported by Robert Forsman.
 
   17 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
   -oracle-jre-bin-1.7.0.51.ebuild:
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index c4d798f9efdd..bfb18b7a6a47 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -8,26 +8,23 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 DIST jre-7u55-linux-i586.tar.gz 48340455 SHA256 fa674c83c25a65edeca289321c9bb1c0fe9c0eaae64dc1bf3409e2c6a5f46c80 SHA512 f365a2548ea6ff9cf263b0dd71100eb70d842a4abd72d852e7698d9d7dbee97c4da2654795035adbc4519705a3d7eb81031566f2a97eaeeadaa439ca9a8867fa WHIRLPOOL 88abacb65259fd59c89a70e72ff0a258f6b0b178afa826502eb46e7109abe586094d79762148b14c1d97dce2d1b3a9e06736a92d82c839ef2fe8c8e8310918b5
 DIST jre-7u55-linux-x64.tar.gz 46933036 SHA256 973ddefe3e1cbc435458988a8868eff196970f940b84b79383fd4a8414e0b899 SHA512 09a4076c49bd79796660e9cb223156d57bb2d9d7b7d0de9d61cd3a52e34a30e43b416adc5e71ff9ffd9cea6a1ca1e0f04c5786cf5cb9560c5e5f02f9ebd9f607 WHIRLPOOL f365561f65e3e3f9642f097c66582b9861181cf41a2d6a7fade071579cde689a377bf59fbd51e7379c2f316fc204226f46bae121cf287c336e275beb2c3680ee
+DIST jre-7u60-linux-i586.tar.gz 48420952 SHA256 76e9c4f7cdd62025fe7004221cdeceabcc3adb2f093fc3ee127d30c95df7277e SHA512 db73c3dfdd82524c2b5c5724ec014acff2c21621cdd5b0f5283d1ede63f8c4d68d474d2c9e340e39b50105fb0df6dcbb625f9ce15fdcebda62c49a8c21a718cf WHIRLPOOL 3ceef31fc5ad9f464097d5ba4054328f3e24c2bdac0fb456d402b01caa93b11110ca1ade8fa7ff5e9ee0d0c21f42023ef1f32042e9e6802964dd0840a24cd6d0
+DIST jre-7u60-linux-x64.tar.gz 46984374 SHA256 73d6d759f524320671904447f9436ff0e60aa9379cacc0838001d6259e86216d SHA512 5b788e4f6a3bf70d32206d7b2b435b0a91d94ca364dc8b1546b7a7612240f316278f21b37b7ef7c4b2e4558f887a470985c65b378e2fc0d408a63da5c9c3369a WHIRLPOOL f570253cbe057781a2f420e03088d75b3ee34f3c5d26c1077f0ca3e986401a418c0d9381351c0cb9c51c3ea6288ce1829acedafdd8a4e604fcba250930288684
 DIST jre-8u5-linux-i586.tar.gz 58156527 SHA256 77a81e63325af682d52875e6699d5edd5f3be668025bcc99f5d9132c46b82053 SHA512 095feaf587e5c24bb1157e9a6bfafbcc11d1e726d4b7573b82e1412932a53a3bf942721877c95f87853b7fbc92e3dca5abe83c13d6fa52eee608c4d41afe7a30 WHIRLPOOL 973ec3d2cd30f271f56c86b0097723d5aeaf7301f9a715af3189f922c767f0d31e8c613554338f8e55c7ecf6d2bb36794c3f1c84d01e22b31829e45b73cddb29
 DIST jre-8u5-linux-x64.tar.gz 57056684 SHA256 de7ba8e27b9e7352c44608969871dc11dedadd26d81865f9a42aabff8dadba2a SHA512 961a3dc49fe8ee3bb51b871c139c65c4c020431b2ff5cbe3532c0af3e2d584a094f2a3b8aee89cf1e803bd0ae2dd3447f31377af3f16c477c0150a281a3f0378 WHIRLPOOL 3503edab4be5d345c0ecb398583420a017e8c33eb6385d7d7844326e77be6962dfb1724867721ff0e96de6cf9b62d6bd0cb6ab34071add1f5e7ff5d01712b02a
 EBUILD oracle-jre-bin-1.7.0.55.ebuild 4956 SHA256 ec5a0c1801bbe6428e757d1eb4a76ab8836f783587cde44ff74a95e4cb9d40d7 SHA512 97073a55620888dd2bb4ecab5c3c5da276832b727e55ca32841cb7ce5026e40c83aca2eb41a2435dfe9016d3b8b75ded0939d4cebb44fb69373cd646d55c23ae WHIRLPOOL f326ac4d59e4a900623a377902269fabc804cc17266120b93739bdd7079b0a4c719d537505a1e2cedd38e941c75117542191bc2e1220b1e20604e2e8872d318c
+EBUILD oracle-jre-bin-1.7.0.60.ebuild 4961 SHA256 5865f214fd990ddc551be1073f08af64409e27534ea5d52a8b952b23399d7829 SHA512 1c13912dfb123bc1a3051a90bc8cb39b6150fae9999d72de2bfcbf4c02de1f36e31ad4bb92e93b286b7f1a0e806482dcee1d0e6b6490c07023d378ede5460297 WHIRLPOOL 292c7269aa81f6ed40c724a8a87e9a59490ab7fcb28ae40ea6a1f2fb810d5ebbf5c6c19a192e4dc12f30693a1605a75f8044e9f149ebf3527ba9f249f26a65ba
 EBUILD oracle-jre-bin-1.8.0.5.ebuild 5384 SHA256 ed8271cfafdbf100187d3956de712a4f563685e7b4e93187d85fe346e9cf5b1d SHA512 10a3788165df190c66be07a286d6350e9163103bf8894fe81f1c2b7eeb04da065d21b1bc095cca28ee119664b7ee6d664ce454589d9a901723300723028ab408 WHIRLPOOL 01f4ad6a43607afcc15bcd1706e2e970b84758ae26e6423a2384f0644ef8a78433239faf20817847ff1a0787fed5d2ebf5210f4abaa162bef5c7497c992eb3f1
-MISC ChangeLog 9275 SHA256 a50daca407cc4d7c45ba6b6d7ae4f45e76e8085f1ae25a4b077c758f876bfad5 SHA512 6ab2d5d56e1ffb710f82ccb25d498e8d04cbb77912bccbe0aee87172a987319416971570227c0a5988875186eccc61b36d719d483c2b607dd6f70d70c92b130a WHIRLPOOL 14ac6db3dec5e8d679dc9c0c18b060ca03be315920e9441fae0c30ce751e8e5ef18ee7c13cb2a670cc4efae9594fd0f7d57850ea84484688dd039e4fff3fdbf6
+MISC ChangeLog 9474 SHA256 12906396ca042dd73267daaf66fb27ce893b8faeb500e13d50e921367057a619 SHA512 6fbb2464e4c7a1661dc2f026dc48c85b1c7c28bc20d0e75204172b975b8febed0d935f49893e99d8ddde93a9c925c07d871a3f58845b92d95c2b15c61ac58685 WHIRLPOOL 8d4aac792b4cf7d182a028a8cc72bd62afbb9e1a813441aee78721f4db3ea11deca017d5784a1d0ea278e7446c2da9339f16a5a076abd3d260655e0331b4b566
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTT42pAAoJELp701BxlEWf2qEP/26dfMqfveav+HhE1IwBjoYF
-l6xn2SGqBvxmyxGnUi4WbZdYnLQZThoZzH/a9u8QCWtK3jScIGxDNmTr7DQNDHUo
-ybdOitDqTtYg3IaVPdcoUM3mxpMk1G/OzkcpP8EMqRmaAUQ6gzbdVNFbgU8b658S
-j3VSdZp+Pi0IMALRNK3nxK+yYV1R+j1MK26x8tVI0vPqDiKdMTBwU/jdrB6MkMlY
-uS/kwUZn96Tgp1hhycAGTnTJRxbwrdqor0gDEw7n5JbsVGajMYYcj6yJPfwQhSrk
-5kpoGHN+otO5aE4YtO1a0fBXngLmRCUFzgnHyJNZUr4E/hyyuA3KTleeSHYmg5tj
-zHa35KAOezmhLAMVoI3LLLmd7bf0aQNxIkSkuZx2Lgt7eEuMBYVHB9vcrwOwkD8K
-4a2Ddzdy2VA3kdvsT6Yuapfy/RiBRj0kTxv/3NQxuPmZWVw8/l9pIqk7Diurxkl4
-3nrYRPeVVGrNDIE5VR20fdteRvkwnygzvfKBemuMCZaA89+ZNdKKvc9zHMxHdOME
-ZLHyqWQTB05zMrZ2E4eB6HjVzeh8bM+p8tby7NFJoFoDD0nrzNLapW7enG4vXAkL
-ZQk5q5tE9lRERl5ZW1yQFscSPRP5BZlDVKIdVPsNp0yS5x7phPHnGmvXYFaGrNCe
-kNHoCwftj/lVWQNDW5nb
-=r7v6
+iQEcBAEBCAAGBQJThjPJAAoJEJWyH81tNOV9MnwIAMbbntVlFXnXbB84xewcNtk4
+fkmLnvUdzZXVW1LT+mShsNS6uc8CNaqDpA8ObGr5/4Ib9m+LuYb7CoMrnw/alADo
+mvznpDKOxEudHTgHW5WKrrjd9ilWFvT4Esw2USqaN++DCBrdxIo8jMMmcCdCYAEy
+tyE+/+WKtTJz+bBp3sWVCv5lBf7PCxEC/Le1ptXcR6oXUo3RsJUdJ2XSVXmTw3vc
+KhJacKnz3d+HObgvHH1Ywse5F2iyt7luKOU2cVal8Qz896YrrJOmAtOh7OWhQ1Qc
+CqECQUu/imq/0yHUFwRKGje43+0hw0z2WBHYjmtmUKjfakjOwob/1/MeWX/77Ps=
+=Bgr/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
new file mode 100644
index 000000000000..4ee6ba1f53d4
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild,v 1.1 2014/05/28 19:07:26 tomwij Exp $
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	x86? ( ${X86_AT} )
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	fi
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+}
+
+src_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			bin/java -client -Xshare:dump || die
+			bin/java -server -Xshare:dump || die
+			;;
+		*)
+			bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	dodoc COPYRIGHT README
+
+	if use jce; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}